diff options
| author | Natty Linden <natty@lindenlab.com> | 2016-09-14 15:53:58 -0700 |
|---|---|---|
| committer | Natty Linden <natty@lindenlab.com> | 2016-09-14 15:53:58 -0700 |
| commit | 98cb9251853a594a51bdc8c70a00c6ecc50bb412 (patch) | |
| tree | dc93a8af006ff5f41722aa2e86ab128dd33984c9 /indra/newview/llpanelprofile.cpp | |
| parent | f0c469b649feb2f94b07377faeb87e27fa3041a4 (diff) | |
MAINT-6731 Use web profile URLs from the grid configuration
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 184238c40c..8afa35efa0 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -44,19 +44,11 @@ static const std::string PANEL_PICKS = "panel_picks"; std::string getProfileURL(const std::string& agent_name) { - std::string url; - - if (LLGridManager::getInstance()->isInProductionGrid()) - { - url = gSavedSettings.getString("WebProfileURL"); - } - else - { - url = gSavedSettings.getString("WebProfileNonProductionURL"); - } + std::string url = "[WEB_PROFILE_URL][AGENT_NAME]"; LLSD subs; + subs["WEB_PROFILE_URL"] = LLGridManager::getInstance()->getWebProfileURL(); subs["AGENT_NAME"] = agent_name; - url = LLWeb::expandURLSubstitutions(url,subs); + url = LLWeb::expandURLSubstitutions(url, subs); LLStringUtil::toLower(url); return url; } |