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/llgroupactions.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llgroupactions.cpp') diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 5393678a6b..7b7780cba8 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -53,6 +53,12 @@ public: bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web) { + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableGroupInfo")) + { + LLNotificationsUtil::add("NoGroupInfo"); + return false; + } + if (tokens.size() < 1) { return false; -- cgit v1.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/llgroupactions.cpp | 4 ++-- indra/newview/llpanelpicks.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'indra/newview/llgroupactions.cpp') diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 7b7780cba8..6953723f0c 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -55,8 +55,8 @@ public: { if (!LLUI::sSettingGroups["config"]->getBOOL("EnableGroupInfo")) { - LLNotificationsUtil::add("NoGroupInfo"); - return false; + LLNotificationsUtil::add("NoGroupInfo", LLSD(), LLSD(), std::string("ConfirmQuit")); + return true; } if (tokens.size() < 1) 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.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/llappviewer.cpp | 14 ++++++++++++++ indra/newview/llgroupactions.cpp | 2 +- indra/newview/llpanelpicks.cpp | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'indra/newview/llgroupactions.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c47dcc11b2..c8b7895d3f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3311,6 +3311,20 @@ static bool finish_quit(const LLSD& notification, const LLSD& response) } static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_quit); +static bool switch_standard_skin_and_quit(const LLSD& notification, const LLSD& response) +{ + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); + + if (option == 0) + { + gSavedSettings.setString("SessionSettingsFile", ""); + LLAppViewer::instance()->requestQuit(); + } + return false; +} + +static LLNotificationFunctorRegistration standard_skin_quit_reg("SwitchToStandardSkinAndQuit", switch_standard_skin_and_quit); + void LLAppViewer::userQuit() { if (gDisconnected || gViewerWindow->getProgressView()->getVisible()) diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 6953723f0c..7c56e610ce 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -55,7 +55,7 @@ public: { if (!LLUI::sSettingGroups["config"]->getBOOL("EnableGroupInfo")) { - LLNotificationsUtil::add("NoGroupInfo", LLSD(), LLSD(), std::string("ConfirmQuit")); + LLNotificationsUtil::add("NoGroupInfo", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); return true; } 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.3