From b092862b03db8c5fc468ba41755175b066d75039 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 14:22:38 -0700 Subject: [PATCH] Missed another spot --- domain-server/resources/web/settings/js/settings.js | 4 +++- libraries/networking/src/AccountManager.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 14347b6be1..ecd67e30eb 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -1,6 +1,8 @@ var Settings = { showAdvanced: false, - METAVERSE_URL: 'https://metaverse.highfidelity.com', + METAVERSE_URL_STABLE: 'https://metaverse.highfidelity.com', + METAVERSE_URL_STAGING: 'https://staging.highfidelity.com', + METAVERSE_URL: METAVERSE_URL_STABLE, ADVANCED_CLASS: 'advanced-setting', DEPRECATED_CLASS: 'deprecated-setting', TRIGGER_CHANGE_CLASS: 'trigger-change', diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index 09c38e2d3e..3dae03200e 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -58,6 +58,9 @@ using UserAgentGetter = std::function; const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_USER_AGENT; }; +// If you want to use STAGING instead of STABLE, +// don't forget to ALSO change the Domain Server Metaverse Server URL, which is at the top of: +// \domain-server\resources\web\settings\js\settings.js const QUrl METAVERSE_SERVER_URL_STAGING = "https://staging.highfidelity.com"; const QUrl METAVERSE_SERVER_URL_STABLE = "https://metaverse.highfidelity.com"; const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE;