diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:51:07 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:51:07 -0800 |
| commit | 6158929e3ee87bc879c99d35963a151006394ed7 (patch) | |
| tree | f3a7b2ac9530af02cfc9d83558e765bbe5a63441 | |
| parent | e3c5d6d553ca7d8441f94f45603a2e73d6968f3c (diff) | |
SOCIAL-586 As a user I want to see my Aditi profile when logging into the Aditi grid
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/llpanelprofile.cpp | 12 |
2 files changed, 22 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..ced4c3a2eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3899,6 +3899,17 @@ <key>Value</key> <string>https://my.secondlife.com/[AGENT_NAME]</string> </map> + <key>WebProfileNonProductionURL</key> + <map> + <key>Comment</key> + <string>URL for 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> <map> <key>Comment</key> diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 4f13c0c022..42c8f1d727 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -34,13 +34,23 @@ #include "llpanelpicks.h" #include "lltabcontainer.h" #include "llviewercontrol.h" +#include "llviewernetwork.h" static const std::string PANEL_PICKS = "panel_picks"; static const std::string PANEL_PROFILE = "panel_profile"; std::string getProfileURL(const std::string& agent_name) { - std::string url = gSavedSettings.getString("WebProfileURL"); + std::string url; + + if (LLGridManager::getInstance()->isInProductionGrid()) + { + url = gSavedSettings.getString("WebProfileURL"); + } + else + { + url = gSavedSettings.getString("WebProfileNonProductionURL"); + } LLSD subs; subs["AGENT_NAME"] = agent_name; url = LLWeb::expandURLSubstitutions(url,subs); |