From e02b83c350d9b642baa610829098539f18efa651 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
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.2.3


From e062a2778b034d2f5df67cc8ec6f98203c6dbf73 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
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 ++--
 1 file changed, 2 insertions(+), 2 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)
-- 
cgit v1.2.3


From 592294a6acbbc8681d3fc808db5d3e24bf62a524 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
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/llgroupactions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llgroupactions.cpp')

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;
 		}
 
-- 
cgit v1.2.3