Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-30 10:50:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

put back default values in settings response

Browse source
This commit is contained in:
Stephen Birarda 2018-02-07 15:22:33 -08:00
parent 3516a8939a
commit 37b8fa2c0c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
domain-server/resources/web/js/shared.js
View file

@ -164,11 +164,12 @@ function getDomainFromAPI(callback) {
if (callback === undefined) { if (callback === undefined) {
callback = function() {}; callback = function() {};
} }
var domainID = Settings.data.values.metaverse.id; if (!domainIDIsSet()) {
if (domainID === null || domainID === undefined || domainID === '') {
callback({ status: 'fail' }); callback({ status: 'fail' });
return null; return null;
} else {
var domainID = Settings.data.values.metaverse.id;
} }
pendingDomainRequest = $.ajax({ pendingDomainRequest = $.ajax({

2
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -1162,7 +1162,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
// and exclude default values // and exclude default values
rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true, rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true,
forDomainSettings, forContentSettings, forDomainSettings, forContentSettings,
false); true);
connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json"); connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");