From 0e86be86600a899b1095e4614df2eda94da171ed Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 13 Jul 2016 14:48:23 -0700 Subject: [PATCH] use dev metaverse --- domain-server/resources/describe-settings.json | 8 -------- domain-server/resources/web/settings/js/settings.js | 4 +++- domain-server/src/DomainServer.cpp | 4 +++- libraries/networking/src/NetworkingConstants.h | 4 +++- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 885a289db4..a81b58a30e 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -618,14 +618,6 @@ "name": "permissions_id", "label": "Group Name" }, - { - "name": "rank", - "label": "Rank" - }, - { - "name": "rank_name", - "label": "Rank Name" - }, { "name": "group_id", "label": "Group ID", diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 25cf860f54..54be33e764 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: 'https://metaverse.highfidelity.com', + // METAVERSE_URL: 'http://localhost:3000', + METAVERSE_URL: 'https://devdataweb.highfidelity.com', ADVANCED_CLASS: 'advanced-setting', TRIGGER_CHANGE_CLASS: 'trigger-change', DATA_ROW_CLASS: 'value-row', diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 0395f3a766..b7c61b600a 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -44,7 +44,9 @@ int const DomainServer::EXIT_CODE_REBOOT = 234923; -const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.com"; +// const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.com"; +// const QString ICE_SERVER_DEFAULT_HOSTNAME = "localhost"; +const QString ICE_SERVER_DEFAULT_HOSTNAME = "devdataweb.highfidelity.com"; DomainServer::DomainServer(int argc, char* argv[]) : QCoreApplication(argc, argv), diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index a512ae8887..62a8f29088 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -15,7 +15,9 @@ #include namespace NetworkingConstants { - const QUrl METAVERSE_SERVER_URL = QUrl("https://metaverse.highfidelity.com"); + // const QUrl METAVERSE_SERVER_URL = QUrl("https://metaverse.highfidelity.com"); + // const QUrl METAVERSE_SERVER_URL = QUrl("http://localhost:3000"); + const QUrl METAVERSE_SERVER_URL = QUrl("https://devdataweb.highfidelity.com"); } #endif // hifi_NetworkingConstants_h