History

Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching

ZappoMan committed 11 years ago

Commit d2deef92 parents 50f44c8 a12fd5c7 files · +79 −90Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+2−5
@@ -1714,12 +1714,9 @@ bool Application::acceptSnapshot(const QString& urlString) { · 1713 unmodified lines
17141714
17151715 SnapshotMetaData* snapshotData = Snapshot::parseSnapshotData(snapshotPath);
17161716 if (snapshotData) {
1717− if (!snapshotData->getDomain().isEmpty()) {
1718− DependencyManager::get<NodeList>()->getDomainHandler().setHostnameAndPort(snapshotData->getDomain());
1717+ if (!snapshotData->getURL().toString().isEmpty()) {
1718+ DependencyManager::get<AddressManager>()->handleLookupString(snapshotData->getURL().toString());
17191719 }
1720−
1721− _myAvatar->setPosition(snapshotData->getLocation());
1722− _myAvatar->setOrientation(snapshotData->getOrientation());
17231720 } else {
17241721 QMessageBox msgBox;
17251722 msgBox.setText("No location details were found in the file "