From 25423e4de196b1d0e2320ae1bd878e1b2d3834b9 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 12 Jun 2011 12:32:42 -0400
Subject: [PATCH 1/2] FIRE-1207, refresh button disappears on group info panel

---
 .../xui/en/panel_group_info_sidetray.xml      | 39 +++++++------------
 .../xui/en/panel_group_info_sidetray.xml      | 39 +++++++------------
 .../xui/en/panel_group_info_sidetray.xml      | 39 +++++++------------
 3 files changed, 42 insertions(+), 75 deletions(-)

diff --git a/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
index 0322bc3b5e..4423c701e2 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
@@ -149,37 +149,26 @@ background_visible="true"
     </tab_container>
    </layout_panel>
   </layout_stack>
-
+  
+			<button
+		     follows="bottom|left"
+		     height="23"
+		     image_overlay="Refresh_Off"
+		     layout="topleft"
+		     left="6"
+		     top_pad="5"
+		     name="btn_refresh"
+		     width="23" />
+				     
    		   <layout_stack
 	     	follows="bottom|left|right"
 			height="25"
 			layout="topleft"
 			name="button_row_ls"
-			left="6"
+			left_pad="0"
 			orientation="horizontal"
-			top_pad="5"
-			width="475">
-
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left="0"
-				name="btn_refresh_lp"
-			    user_resize="false"
-			    auto_resize="false"
-				width="24">
-					<button
-				     follows="bottom|left|right"
-				     height="23"
-				     image_overlay="Refresh_Off"
-				     layout="topleft"
-				     left="1"
-				     top="0"
-				     name="btn_refresh"
-				     width="23" />
-				</layout_panel>
-
+			top_delta="2"
+			width="445">
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_group_info_sidetray.xml
index 0322bc3b5e..4423c701e2 100644
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_group_info_sidetray.xml
@@ -149,37 +149,26 @@ background_visible="true"
     </tab_container>
    </layout_panel>
   </layout_stack>
-
+  
+			<button
+		     follows="bottom|left"
+		     height="23"
+		     image_overlay="Refresh_Off"
+		     layout="topleft"
+		     left="6"
+		     top_pad="5"
+		     name="btn_refresh"
+		     width="23" />
+				     
    		   <layout_stack
 	     	follows="bottom|left|right"
 			height="25"
 			layout="topleft"
 			name="button_row_ls"
-			left="6"
+			left_pad="0"
 			orientation="horizontal"
-			top_pad="5"
-			width="475">
-
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left="0"
-				name="btn_refresh_lp"
-			    user_resize="false"
-			    auto_resize="false"
-				width="24">
-					<button
-				     follows="bottom|left|right"
-				     height="23"
-				     image_overlay="Refresh_Off"
-				     layout="topleft"
-				     left="1"
-				     top="0"
-				     name="btn_refresh"
-				     width="23" />
-				</layout_panel>
-
+			top_delta="2"
+			width="445">
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
index 0322bc3b5e..4423c701e2 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
@@ -149,37 +149,26 @@ background_visible="true"
     </tab_container>
    </layout_panel>
   </layout_stack>
-
+  
+			<button
+		     follows="bottom|left"
+		     height="23"
+		     image_overlay="Refresh_Off"
+		     layout="topleft"
+		     left="6"
+		     top_pad="5"
+		     name="btn_refresh"
+		     width="23" />
+				     
    		   <layout_stack
 	     	follows="bottom|left|right"
 			height="25"
 			layout="topleft"
 			name="button_row_ls"
-			left="6"
+			left_pad="0"
 			orientation="horizontal"
-			top_pad="5"
-			width="475">
-
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left="0"
-				name="btn_refresh_lp"
-			    user_resize="false"
-			    auto_resize="false"
-				width="24">
-					<button
-				     follows="bottom|left|right"
-				     height="23"
-				     image_overlay="Refresh_Off"
-				     layout="topleft"
-				     left="1"
-				     top="0"
-				     name="btn_refresh"
-				     width="23" />
-				</layout_panel>
-
+			top_delta="2"
+			width="445">
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"

From afd1cab1246ee17b9aca69cd66655bbc51ca1905 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 12 Jun 2011 12:35:38 -0400
Subject: [PATCH 2/2] FIRE-1128, tenative fix for group notices triggering
 panel changes

---
 indra/newview/llgroupactions.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 8afd70e544..7c9bf90b6e 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -337,7 +337,8 @@ void LLGroupActions::refresh_notices()
 	params["open_tab_name"] = "panel_group_info_sidetray";
 	params["action"] = "refresh_notices";
 
-	LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
+	// AO: We don't change modals on people unless they manually request this
+	//LLSideTray::getInstance()->showPanel("panel_group_info_sidetray", params);
 }
 
 //static