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

Merge remote-tracking branch 'lirusato/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-22 20:06:03 +01:00
parent b758014ebc dd1e9a68d4
commit d8c846288e
32 changed files with 311 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llstartup.cpp
View File

@@ -4270,6 +4270,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())