From 3f301622159eb887e26f7db3cd61d203c9b632f4 Mon Sep 17 00:00:00 2001 From: Liv Date: Tue, 8 Aug 2017 09:44:36 -0700 Subject: [PATCH] Make spawning point not 0,0,0 and change error message --- interface/src/Application.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d1d92addf6..4e732dad89 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -257,7 +257,7 @@ static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop"; static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system"; -static const QString DOMAIN_ORIGIN = "/0, 0, 0"; +static const QString DOMAIN_SPAWNING_POINT = "/0, -200, 0"; const QHash Application::_acceptedExtensions { { SVO_EXTENSION, &Application::importSVOFromURL }, @@ -6129,7 +6129,7 @@ bool Application::askToReplaceDomainContent(const QString& url) { if (DependencyManager::get()->getThisNodeCanReplaceContent()) { // Create a confirmation dialog when this call is made const int MAX_CHARACTERS_PER_LINE = 90; - static const QString infoText = simpleWordWrap("Your domain's content will be replaced, but backup files will not immediately be changed. Save a manual backup of your" + static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. If you want to restore your domain from the current domain content, save a manual backup of your" "models.json.gz file, usually stored at:", MAX_CHARACTERS_PER_LINE) + "\nC:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz"; @@ -6150,7 +6150,7 @@ bool Application::askToReplaceDomainContent(const QString& url) { limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode); return true; }); - DependencyManager::get()->handleLookupString(DOMAIN_ORIGIN); + DependencyManager::get()->handleLookupString(DOMAIN_SPAWNING_POINT); } } else {