diff options
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 34e1fd09d8..7aabd5247a 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -461,8 +461,10 @@ public: // requires trusted browser to trigger LLProfileHandler() : LLCommandHandler("profile", UNTRUSTED_THROTTLE) { } - bool handle(const LLSD& params, const LLSD& query_map, - LLMediaCtrl* web) + bool handle(const LLSD& params, + const LLSD& query_map, + const std::string& grid, + LLMediaCtrl* web) { if (params.size() < 1) return false; std::string agent_name = params[0]; @@ -509,8 +511,10 @@ public: return false; } - bool handle(const LLSD& params, const LLSD& query_map, - LLMediaCtrl* web) + bool handle(const LLSD& params, + const LLSD& query_map, + const std::string& grid, + LLMediaCtrl* web) { if (params.size() < 2) return false; LLUUID avatar_id; @@ -1295,14 +1299,14 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data childSetVisible("badge_layout", TRUE); childSetVisible("partner_spacer_layout", FALSE); } - else if (customer_lower == "premium_lifetime") + else if (customer_lower == "secondlifetime_premium") { - getChild<LLUICtrl>("badge_icon")->setValue("Profile_Premium_Lifetime"); + getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Premium_Lifetime"); getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumLifetime")); childSetVisible("badge_layout", TRUE); childSetVisible("partner_spacer_layout", FALSE); } - else if (customer_lower == "pplus_lifetime" || customer_lower == "premium_plus_lifetime") + else if (customer_lower == "secondlifetime_premium_plus") { getChild<LLUICtrl>("badge_icon")->setValue("Profile_Badge_Pplus_Lifetime"); getChild<LLUICtrl>("badge_text")->setValue(getString("BadgePremiumPlusLifetime")); |