From e02b83c350d9b642baa610829098539f18efa651 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 22:06:21 -0800 Subject: SOCIAL-608 WIP Classified link is available in Basic mode --- indra/newview/llpanelpicks.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/llpanelpicks.cpp') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index c4f3866cad..72db138ef0 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -83,6 +83,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks")) + { + LLNotificationsUtil::add("NoPicks"); + return false; + } + // handle app/classified/create urls first if (params.size() == 1 && params[0].asString() == "create") { @@ -189,6 +195,12 @@ public: bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds")) + { + LLNotificationsUtil::add("NoClassifieds"); + return false; + } + // handle app/classified/create urls first if (params.size() == 1 && params[0].asString() == "create") { -- cgit v1.2.3 From e062a2778b034d2f5df67cc8ec6f98203c6dbf73 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 23:43:05 -0800 Subject: SOCIAL-608 FIX Create Classified link is available in Basic mode SOCIAL-609 FIX Create Pick link is available in Basic mode in the web profile SOCIAL-610 FIX View group info in Viewer sidebar are available in Basic mode --- indra/newview/llpanelpicks.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/llpanelpicks.cpp') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 72db138ef0..d27f29ca14 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -70,6 +70,7 @@ static const std::string CLASSIFIED_NAME("classified_name"); static LLRegisterPanelClassWrapper t_panel_picks("panel_picks"); + class LLPickHandler : public LLCommandHandler, public LLAvatarPropertiesObserver { @@ -85,8 +86,8 @@ public: { if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks")) { - LLNotificationsUtil::add("NoPicks"); - return false; + LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("ConfirmQuit")); + return true; } // handle app/classified/create urls first @@ -197,8 +198,8 @@ public: { if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds")) { - LLNotificationsUtil::add("NoClassifieds"); - return false; + LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("ConfirmQuit")); + return true; } // handle app/classified/create urls first -- cgit v1.2.3 From 592294a6acbbc8681d3fc808db5d3e24bf62a524 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 1 Mar 2011 20:11:49 -0800 Subject: SOCIAL-615 FIX Selecting create group, classified, or pick in profile and responding to notification with Don't Quit, clicking on the action again does not show notification --- indra/newview/llpanelpicks.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelpicks.cpp') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index d27f29ca14..ddce83c616 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -86,7 +86,7 @@ public: { if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks")) { - LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("ConfirmQuit")); + LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); return true; } @@ -198,7 +198,7 @@ public: { if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds")) { - LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("ConfirmQuit")); + LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); return true; } -- cgit v1.2.3