Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes proposed by Cinder, thankies~

Browse Source
This commit is contained in:
Inusaito Sayori
2015-02-24 00:29:53 -05:00
parent f2a059e985
commit 21c24431db
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lfsimfeaturehandler.cpp
View File

@@ -84,12 +84,12 @@ void LFSimFeatureHandler::setSupportedFeatures()
//if (hg) //if (hg)
{ {
has_feature_or_default(mDestinationGuideURL, extras, "destination-guide-url"); has_feature_or_default(mDestinationGuideURL, extras, "destination-guide-url");
mMapServerURL = extras.has("map-server-url") ? extras["map-server-url"].asString() : ""; mMapServerURL = extras.has("map-server-url") ? extras["map-server-url"].asString() : LLStringUtil::null;
has_feature_or_default(mSearchURL, extras, "search-server-url"); has_feature_or_default(mSearchURL, extras, "search-server-url");
if (extras.has("GridName")) if (extras.has("GridName"))
{ {
const std::string& grid_name(extras["GridName"]); const std::string& grid_name(extras["GridName"]);
mGridName = gHippoGridManager->getConnectedGrid()->getGridName() != grid_name ? grid_name : ""; mGridName = gHippoGridManager->getConnectedGrid()->getGridName() != grid_name ? grid_name : LLStringUtil::null;
} }
} }
has_feature_or_default(mSayRange, extras, "say-range"); has_feature_or_default(mSayRange, extras, "say-range");
@@ -102,7 +102,7 @@ void LFSimFeatureHandler::setSupportedFeatures()
//if (hg) //if (hg)
{ {
mDestinationGuideURL.reset(); mDestinationGuideURL.reset();
mMapServerURL = ""; mMapServerURL = LLStringUtil::null;
mSearchURL.reset(); mSearchURL.reset();
mGridName.reset(); mGridName.reset();
} }