merge storm-154

2 files changed, 15 insertions, 57 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 2a3add161a..3ded5c6678 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -177,36 +177,16 @@ background_visible="true"
          </accordion>
    </layout_panel>
   </layout_stack>
-  
-  <layout_stack
-     name="layout"
-     orientation="horizontal"
-     follows="bottom|left|right"
-     left="8"
-     top_pad="0"
-     height="30"
-     width="292"
-     border_size="0">
-     
-     	<layout_panel
-         height="30"
-         layout="topleft"
-         auto_resize="false"
-         left="0"
-         top_pad="0"
-	     name="button_row"
-	     follows="bottom|left|right"
-	     width="313">
    
    		   <layout_stack
 	     	follows="bottom|left|right"
 			height="25"
 			layout="topleft"
 			name="button_row_ls"
-			left="2"
+			left="6"
 			orientation="horizontal"
 			top_pad="5"
-			width="309">
+			width="297">
 	
 				<layout_panel
 				follows="bottom|left|right"
@@ -215,7 +195,7 @@ background_visible="true"
 				left="0"
 				name="btn_refresh_lp"
 			    user_resize="false" 
-			    auto_resize="true"
+			    auto_resize="false"
 				width="24">
 					<button
 				     follows="bottom|left|right"
@@ -236,7 +216,7 @@ background_visible="true"
 				name="btn_chat_lp"
 			    user_resize="false" 
 			    auto_resize="true"
-				width="83">
+				width="91">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
@@ -244,7 +224,7 @@ background_visible="true"
 				     left="1"     
 				     height="23"
 				     top="0"
-				     width="82" />		
+				     width="90" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -255,7 +235,7 @@ background_visible="true"
 				name="call_btn_lp"
 			    user_resize="false" 
 			    auto_resize="true"
-				width="113">
+				width="91">
 					<button
 			         follows="bottom|left|right"
 			         left="1"
@@ -265,7 +245,7 @@ background_visible="true"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="112" />		
+			         width="90" />		
 				</layout_panel>
 				
 				<layout_panel
@@ -276,7 +256,7 @@ background_visible="true"
 				name="btn_apply_lp"
 			    user_resize="false" 
 			    auto_resize="true"
-				width="83">
+				width="91">
 					<button
 				     follows="bottom|left|right"
 				     height="23"
@@ -285,18 +265,7 @@ background_visible="true"
 				     name="btn_apply"
 				     left="1"
 				     top="0"
-				     width="82" />
-				</layout_panel>
-				
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left_pad="3"
-				name="btn_create_lp"
-			    user_resize="false" 
-			    auto_resize="true"
-				width="104">
+				     width="90" />
 					<button
     				 follows="bottom|left|right"
 	                 height="23"
@@ -307,19 +276,8 @@ background_visible="true"
      				 name="btn_create"
                		 visible="true"
                  	 tool_tip="Create a new Group"
-                 	 width="103" />	
+                 	 width="90" />	
 				</layout_panel>
-		</layout_stack>
-   <!--<button
-     left_pad="3"
-     height="23"
-     label="Cancel"
-     label_selected="Cancel"
-     name="btn_cancel"
-     visible="false"
-     width="65" />-->
-     </layout_panel>
-     
-     </layout_stack>
+		   </layout_stack>
   
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index e2cd27c419..78b192d4af 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -344,7 +344,7 @@
 				name="add_friend_btn_lp"
 			    user_resize="false" 
 			    auto_resize="true"
-				width="118">
+				width="121">
 					<button
 			         follows="bottom|left|right"
 			         height="23"
@@ -355,7 +355,7 @@
 			         name="add_friend"
 			         tool_tip="Offer friendship to the Resident"
 			         top="0"
-			         width="117" />	
+			         width="120" />	
 				</layout_panel>
 				
 				<layout_panel
@@ -430,8 +430,8 @@
 				left_pad="3"
 				name="overflow_btn_lp"
 			    user_resize="false" 
-			    auto_resize="true"
-				width="27">
+			    auto_resize="false"
+				width="24">
 					<button
 			         follows="bottom|left|right"
 			         height="23"