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

Bug fix: don't get web profile when grid does not support that.

Browse Source
This commit is contained in:
Aleric Inglewood
2013-07-15 02:38:10 +02:00
parent 6a7f7bf4de
commit 6fd0baae5d
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llpanelprofile.cpp
View File

@@ -52,6 +52,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 = gSavedSettings.getString("WebProfileURL"); std::string url = gSavedSettings.getString("WebProfileURL");
llassert(!url.empty());
LLSD subs; LLSD subs;
subs["AGENT_NAME"] = agent_name; subs["AGENT_NAME"] = agent_name;
url = LLWeb::expandURLSubstitutions(url,subs); url = LLWeb::expandURLSubstitutions(url,subs);

4
indra/newview/llviewermedia.cpp
View File

@@ -1446,6 +1446,9 @@ void LLViewerMedia::setOpenIDCookie()
getCookieStore()->setCookiesFromHost(sOpenIDCookie, authority.substr(host_start, host_end - host_start)); getCookieStore()->setCookiesFromHost(sOpenIDCookie, authority.substr(host_start, host_end - host_start));
// Does grid supports web profiles at all?
if (!gSavedSettings.getString("WebProfileURL").empty())
{
// Do a web profile get so we can store the cookie // Do a web profile get so we can store the cookie
AIHTTPHeaders headers; AIHTTPHeaders headers;
headers.addHeader("Accept", "*/*"); headers.addHeader("Accept", "*/*");
@@ -1461,6 +1464,7 @@ void LLViewerMedia::setOpenIDCookie()
new LLViewerMediaWebProfileResponder(raw_profile_url.getAuthority()), new LLViewerMediaWebProfileResponder(raw_profile_url.getAuthority()),
headers); headers);
} }
}
} }
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////