From 6158929e3ee87bc879c99d35963a151006394ed7 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 9 Mar 2011 11:51:07 -0800 Subject: SOCIAL-586 As a user I want to see my Aditi profile when logging into the Aditi grid --- indra/newview/llpanelprofile.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelprofile.cpp') 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); -- cgit v1.2.3 From bc2aca863f5d27f551e48a2de8f879360a3a96ab Mon Sep 17 00:00:00 2001 From: leyla Date: Mon, 14 Mar 2011 11:23:15 -0700 Subject: SOCIAL-687 Call, Map, Share, and Pay options available in web profile for users in minimal skin --- indra/newview/llpanelprofile.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llpanelprofile.cpp') diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 4f13c0c022..cead6c24cd 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -31,6 +31,7 @@ #include "llavataractions.h" #include "llfloaterreg.h" #include "llcommandhandler.h" +#include "llnotificationsutil.h" #include "llpanelpicks.h" #include "lltabcontainer.h" #include "llviewercontrol.h" @@ -105,6 +106,12 @@ public: if (verb == "pay") { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarPay")) + { + LLNotificationsUtil::add("NoAvatarPay", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + LLAvatarActions::pay(avatar_id); return true; } -- cgit v1.2.3