Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 03:52:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make spawning point not 0,0,0 and change error message

Browse source
This commit is contained in:
Liv 2017-08-08 09:44:36 -07:00
parent b63fcc329e
commit 3f30162215
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -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 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<QString, Application::AcceptURLMethod> Application::_acceptedExtensions { const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions {
{ SVO_EXTENSION, &Application::importSVOFromURL }, { SVO_EXTENSION, &Application::importSVOFromURL },
@ -6129,7 +6129,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) { if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
// Create a confirmation dialog when this call is made // Create a confirmation dialog when this call is made
const int MAX_CHARACTERS_PER_LINE = 90; 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) + "models.json.gz file, usually stored at:", MAX_CHARACTERS_PER_LINE) +
"\nC:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz"; "\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); limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
return true; return true;
}); });
DependencyManager::get<AddressManager>()->handleLookupString(DOMAIN_ORIGIN); DependencyManager::get<AddressManager>()->handleLookupString(DOMAIN_SPAWNING_POINT);
} }
} else { } else {