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

Merge branch 'master' into VarRegion

Browse Source
This commit is contained in:
Lirusaito
2013-01-21 21:31:34 -05:00
parent a50f0008b2 21860ded90
commit 415bcd2b6c
81 changed files with 1888 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llstartup.cpp
View File

@@ -1076,7 +1076,7 @@ bool idle_startup()
gSavedSettings.getControl("_NACL_AntiSpamAmount")->getSignal()->connect(boost::bind(&NACLAntiSpamRegistry::handleNaclAntiSpamAmountChanged, _2));
// NaCl End
//good as place as any to create user windlight directories
//good a place as any to create user windlight directories
std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));
LLFile::mkdir(user_windlight_path_name.c_str());
@@ -4284,6 +4284,18 @@ bool process_login_success_response(std::string& password)
gSavedSettings.setString("MapServerURL", map_server_url);
LLWorldMap::gotMapServerURL(true);
}
if(gHippoGridManager->getConnectedGrid()->isOpenSimulator())
{
std::string web_profile_url = response["web_profile_url"];
if(!web_profile_url.empty())
gSavedSettings.setString("WebProfileURL", web_profile_url);
}
else if(!gHippoGridManager->getConnectedGrid()->isInProductionGrid())
{
gSavedSettings.setString("WebProfileURL", "https://my-demo.secondlife.com/[AGENT_NAME]");
}
// Initial outfit for the user.
LLSD initial_outfit = response["initial-outfit"][0];
if(initial_outfit.size())