Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix camelcase

Browse source
This commit is contained in:
Seth Alves 2016-09-19 16:38:34 -07:00
parent 571aaac4d7
commit ba8aa5b50c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain-server/src/DomainServer.cpp
View file

@ -198,7 +198,7 @@ void DomainServer::parseCommandLine() {
if (parser.isSet(domainIDOption)) { if (parser.isSet(domainIDOption)) {
_overridingDomainID = QUuid(parser.value(domainIDOption)); _overridingDomainID = QUuid(parser.value(domainIDOption));
_overRideDomainID = true; _overrideDomainID = true;
qDebug() << "domain-server ID is" << _overridingDomainID; qDebug() << "domain-server ID is" << _overridingDomainID;
} }
} }
@ -351,7 +351,7 @@ void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) {
auto domainObject = jsonObject[DATA_KEY].toObject()[DOMAIN_KEY].toObject(); auto domainObject = jsonObject[DATA_KEY].toObject()[DOMAIN_KEY].toObject();
if (!domainObject.isEmpty()) { if (!domainObject.isEmpty()) {
auto id = _overRideDomainID ? _overridingDomainID.toString() : domainObject[ID_KEY].toString(); auto id = _overrideDomainID ? _overridingDomainID.toString() : domainObject[ID_KEY].toString();
auto name = domainObject[NAME_KEY].toString(); auto name = domainObject[NAME_KEY].toString();
auto key = domainObject[KEY_KEY].toString(); auto key = domainObject[KEY_KEY].toString();
@ -462,7 +462,7 @@ void DomainServer::setupNodeListAndAssignments() {
// set our LimitedNodeList UUID to match the UUID from our config // set our LimitedNodeList UUID to match the UUID from our config
// nodes will currently use this to add resources to data-web that relate to our domain // nodes will currently use this to add resources to data-web that relate to our domain
bool isMetaverseDomain = false; bool isMetaverseDomain = false;
if (_overRideDomainID) { if (_overrideDomainID) {
nodeList->setSessionUUID(_overridingDomainID); nodeList->setSessionUUID(_overridingDomainID);
isMetaverseDomain = true; // assume metaverse domain isMetaverseDomain = true; // assume metaverse domain
} else { } else {

2
domain-server/src/DomainServer.h
View file

@ -209,7 +209,7 @@ private:
QString _iceServerAddr; QString _iceServerAddr;
int _iceServerPort; int _iceServerPort;
bool _overRideDomainID { false }; // should we override the domain-id from settings? bool _overrideDomainID { false }; // should we override the domain-id from settings?
QUuid _overridingDomainID { QUuid() }; // what should we override it with? QUuid _overridingDomainID { QUuid() }; // what should we override it with?
}; };