From e9147cb7fb0cf93fdd26cdf6acbf5f6dd5b6bb79 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 11 Apr 2011 22:19:49 -0500
Subject: [PATCH] Cleaned up overlapping elements in group properties panel

---
 .../default/xui/en-us/panel_group_general.xml | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 4580ed72e..20f75ecbb 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -80,23 +80,23 @@ Hover your mouse over the options for more help.
 		<column label="Title" name="title" relwidth="0.30" />
 		<column label="Last Login" name="online" relwidth="0.25" />
 	</name_list>
-	<text bottom_delta="-18" font="SansSerif" name="text_group_preferences">
+	<text bottom_delta="-10" font="SansSerif" name="text_group_preferences">
 		Group Preferences
 	</text>
 	<panel background_opaque="true" background_visible="false" bevel_style="in"
 	     border="true"
-	     bottom_delta="-104" follows="left|top" height="96" left_delta="0"
+	     bottom_delta="-94" follows="left|top" height="86" left_delta="0"
 	     mouse_opaque="true" name="preferences_container" width="404">
-		<check_box bottom="-20" follows="left|top" font="SansSerifSmall" height="16"
+		<check_box bottom="-17" follows="left|top" font="SansSerifSmall" height="16"
 		     initial_value="true" label="Show in search" left="4" mouse_opaque="true"
 		     name="show_in_group_list" radio_style="false"
 		     tool_tip="Let people see this group in search results." width="95" />
-		<check_box bottom_delta="-18" follows="right|top" font="SansSerifSmall" height="16"
+		<check_box bottom_delta="-16" follows="right|top" font="SansSerifSmall" height="16"
 		     initial_value="false" label="Open enrollment" left="4" mouse_opaque="true"
 		     name="open_enrollement" radio_style="false"
 		     tool_tip="Sets whether this group allows new members to join   without being invited."
 		     width="95" />
-		<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+		<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
 		     initial_value="false" label="Enrollment fee: [CURRENCY]" left_delta="16"
 		     max_length="5" mouse_opaque="true" name="check_enrollment_fee"
 		     radio_style="false" 
@@ -109,7 +109,10 @@ Hover your mouse over the options for more help.
 		     mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
 		     tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
 		     v_pad="0" width="65" />
-		<combo_box allow_text_entry="false" bottom_delta="-30" follows="left|top" height="20" left="6"
+		<text bottom_delta="-12" left="4" font="SansSerifSmall" name="content_rating">
+				Content Rating
+		</text>
+		<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="20" left="6"
 			max_chars="20" mouse_opaque="true" name="group_mature_check" 
 			tool_tip="Sets whether your group information is considered mature."
 			width="130">
@@ -124,29 +127,27 @@ Hover your mouse over the options for more help.
 			</combo_item>
 		</combo_box>
 
-		<panel background_opaque="false" border="false" bottom="-31" height="32" left="225"
-		     name="title_container" width="160">
-			<text bottom="17" font="SansSerifSmall" left="0" name="active_title_label">
-				My Active Title
-			</text>
-			<combo_box length="150" bottom_delta="-22" follows="left|top" height="16" left="0" name="active_title"
-			     tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
-		</panel>
-		<check_box bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="16"
-		     initial_value="false" label="Receive group notices" left_delta="0"
+		<check_box bottom="-17" left="225" follows="left|top" font="SansSerifSmall" height="16"
+		     initial_value="false" label="Receive group notices"
 		     mouse_opaque="true" name="receive_notices" radio_style="false"
 		     tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you."
 		     width="95" />
-    <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-         initial_value="false" label="Join group chat" left_delta="0"
-         mouse_opaque="true" name="receive_chat" radio_style="false"
-         tool_tip="Sets whether you want to participate in group chat.   Uncheck this box if this group is spamming you."
-         width="95" />
-		<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+		<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
+			initial_value="false" label="Join group chat" left_delta="0"
+			mouse_opaque="true" name="receive_chat" radio_style="false"
+			tool_tip="Sets whether you want to participate in group chat.   Uncheck this box if this group is spamming you."
+			width="95" />
+		<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
 		     initial_value="false" label="List group in my profile" left_delta="0"
 		     mouse_opaque="true" name="list_groups_in_profile" radio_style="false"
 		     tool_tip="Sets whether you want to list this group in your Profile"
 		     width="95" />
+		<text bottom_delta="-10" font="SansSerifSmall" left_delta="0" name="active_title_label">
+			My Active Title
+		</text>
+		<combo_box length="120" width="175" bottom_delta="-25" follows="left|top" height="20" left_delta="0" name="active_title"
+		     tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
+		</panel>
 	</panel>
 	<string name="incomplete_member_data_str">
 		Retrieving member data