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

Support web_profile_url response from OSGrid servers for setting WebProfileURL

Browse Source
This commit is contained in:
Lirusaito
2013-01-20 23:00:28 -05:00
parent 48113f8506
commit 21860ded90
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/app_settings/settings.xml
View File

@@ -7814,7 +7814,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>WebProfileURL</key> <key>WebProfileURL</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>URL for SL Web Profiles</string> <string>URL for Web Profiles</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>0</integer>
<key>Type</key> <key>Type</key>
@@ -7822,17 +7822,6 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key> <key>Value</key>
<string>https://my.secondlife.com/[AGENT_NAME]</string> <string>https://my.secondlife.com/[AGENT_NAME]</string>
</map> </map>
<key>WebProfileNonProductionURL</key>
<map>
<key>Comment</key>
<string>URL for SL Web Profiles on Non-Production grids</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>https://my-demo.secondlife.com/[AGENT_NAME]</string>
</map>
<key>HighResSnapshot</key> <key>HighResSnapshot</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

11
indra/newview/llpanelprofile.cpp
View File

@@ -47,16 +47,7 @@ static const std::string PANEL_PICKS = "panel_picks";
std::string getProfileURL(const std::string& agent_name) std::string getProfileURL(const std::string& agent_name)
{ {
std::string url; std::string url = gSavedSettings.getString("WebProfileURL");
if (gHippoGridManager->getConnectedGrid()->isInProductionGrid())
{
url = gSavedSettings.getString("WebProfileURL");
}
else
{
url = gSavedSettings.getString("WebProfileNonProductionURL");
}
LLSD subs; LLSD subs;
subs["AGENT_NAME"] = agent_name; subs["AGENT_NAME"] = agent_name;
url = LLWeb::expandURLSubstitutions(url,subs); url = LLWeb::expandURLSubstitutions(url,subs);

12
indra/newview/llstartup.cpp
View File

@@ -4281,6 +4281,18 @@ bool process_login_success_response(std::string& password)
gSavedSettings.setString("MapServerURL", map_server_url); gSavedSettings.setString("MapServerURL", map_server_url);
LLWorldMap::gotMapServerURL(true); 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. // Initial outfit for the user.
LLSD initial_outfit = response["initial-outfit"][0]; LLSD initial_outfit = response["initial-outfit"][0];
if(initial_outfit.size()) if(initial_outfit.size())