From cb6813961c284450787416e0e8e2f941da1b751b Mon Sep 17 00:00:00 2001
From: JessicaLyon <jessica@trinityenterprises.ca>
Date: Sat, 5 Feb 2011 10:59:37 -0500
Subject: [PATCH] Experimental & for review: Replace group info accordians with
 tabs, patch by Toy Wylie.

---
 .../firestorm/xui/en/floater_im_container.xml |  48 ++
 .../firestorm/xui/en/floater_im_session.xml   | 347 ++++++++++
 .../firestorm/xui/en/panel_group_general.xml  | 282 ++++++++
 .../xui/en/panel_group_info_sidetray.xml      | 262 ++++++++
 .../xui/en/panel_group_land_money.xml         | 392 ++++++++++++
 .../firestorm/xui/en/panel_group_notices.xml  | 372 +++++++++++
 .../firestorm/xui/en/panel_group_roles.xml    | 600 ++++++++++++++++++
 .../skins/firestorm/xui/en/widgets/button.xml |  28 +
 8 files changed, 2331 insertions(+)
 create mode 100644 indra/newview/skins/firestorm/xui/en/floater_im_container.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/floater_im_session.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_group_general.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_group_land_money.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_group_notices.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_group_roles.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/widgets/button.xml

diff --git a/indra/newview/skins/firestorm/xui/en/floater_im_container.xml b/indra/newview/skins/firestorm/xui/en/floater_im_container.xml
new file mode 100644
index 0000000000..2ff322ef95
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/floater_im_container.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+ can_close="true"
+ can_minimize="false"  
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="CONVERSATIONS"
+ width="396">
+    <tab_container
+     follows="left|right|top|bottom"
+     height="390"
+     layout="topleft"
+     left="1"
+     name="im_box_tab_container"
+     tab_position="left"
+     tab_width="115"
+     tab_max_width = "115"
+     tab_height="20"
+     use_custom_icon_ctrl="false"
+     tab_icon_ctrl_pad="2"
+     halign="left"
+     use_ellipses="true"
+     top="0"
+     width="394">
+      <first_tab
+       tab_bottom_image_flash="Toolbar_Left_Flash"/>
+      <middle_tab
+       tab_bottom_image_flash="Toolbar_Middle_Flash"/>
+      <last_tab
+       tab_bottom_image_flash="Toolbar_Right_Flash"/>
+    </tab_container>
+    <icon
+     color="DefaultShadowLight"
+     enabled="false"
+     follows="left|right|bottom"
+     height="20"
+     image_name="tabarea.tga"
+     layout="bottomleft"
+     left="1"
+     name="im_box_tab_container_icon"
+     bottom="10"
+     width="394" />
+</multi_floater>
diff --git a/indra/newview/skins/firestorm/xui/en/floater_im_session.xml b/indra/newview/skins/firestorm/xui/en/floater_im_session.xml
new file mode 100644
index 0000000000..d42c3f1585
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/floater_im_session.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ background_visible="true"
+ default_tab_group="1"
+ follows="all"
+ height="350"
+ layout="topleft"
+ left="0"
+ name="panel_im"
+ top="0"
+ can_dock="false"
+ can_minimize="true"
+ can_close="true"
+ visible="false"
+ width="394"
+ can_resize="true"
+ min_width="250"
+ min_height="190">
+ 
+   <layout_stack
+    border_size="0"
+	animate="false" 
+	default_tab_group="8"
+	follows="top|left"
+	clip="false"
+	height="20"
+	width="200"
+	left_pad="0"
+	layout="topleft"
+	orientation="horizontal"
+	name="ls_control_panel"
+	top="20"
+	left="3">
+       <layout_panel
+          auto_resize="false"
+          user_resize="false"
+          name="slide_panel"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="30"
+          follows="left|top">
+       	<button
+          height="20"
+          follows="left|top"
+          top="0"
+          left="5"
+          image_overlay="TabIcon_Open_Off"
+          layout="topleft"
+          width="25"
+          name="slide_left_btn" />
+       	<button
+          height="20"
+          follows="left|top"
+          top="0"
+          left="5"
+          image_overlay="TabIcon_Close_Off"
+          width="25"
+          name="slide_right_btn" />
+       </layout_panel>
+       
+       <layout_panel
+          name="gprofile_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">
+       	<button
+       		 name="group_info_btn"
+             follows="left|top"
+             top="0"
+             height="20"
+             width="20"
+             image_overlay="profile_icon_24x24"
+	         image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Show this group's profile"/>
+       </layout_panel>
+       
+       <layout_panel
+          name="profile_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">	  
+       		<button
+             name="view_profile_btn"
+             follows="left|top"
+             top="0"
+             image_overlay="profile_icon_24x24"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             tool_tip="Show this resident's profile" />
+       </layout_panel>
+       
+
+       
+       <layout_panel
+          name="trans_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">             
+        	<button
+	          follows="left|top"
+	          top="0"
+	          width="20"
+	          height="20"
+	          image_overlay="TabIcon_Translate_Off"
+	          control_name="TranslateChat"
+	          is_toggle="true"
+	          image_pressed="PushButton_Press"
+	          image_pressed_selected="PushButton_Selected_Press"
+	          image_selected="PushButton_Selected_Press"
+	          tool_tip="Use google language translation"
+              name="translate_btn"/>       
+       </layout_panel>      
+      
+        <layout_panel
+          name="friend_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">
+        	<button
+             follows="left|top"
+             height="20"
+             top="0"
+             image_overlay="friends_icon_24x24"
+	         image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Add this resident as a friend"
+             name="add_friend_btn"
+             width="20" />
+       </layout_panel>
+       
+       <layout_panel
+          name="tp_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">
+        <button
+             follows="left|top"
+             top="0"
+             height="20"
+	         image_overlay="teleport_icon_24x24"
+	         image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Summon / Teleport this resident"
+             name="teleport_btn"
+             width="20" />
+       </layout_panel>
+       
+       <layout_panel
+          name="share_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">
+        <button
+             follows="left|top"
+             top="0"
+             height="20"
+	         image_overlay="gift_icon_24x24"
+	         image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Send an item to this resident"
+             name="share_btn"
+             width="20" />
+       </layout_panel>
+       
+       <layout_panel
+          name="pay_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">
+        	<button
+             follows="left|top"
+             top="0"
+             height="20"
+	         image_overlay="sale_icon_24x24"
+	         image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Send money to this resident"
+             name="pay_btn"
+             width="20" />
+       </layout_panel>
+
+       <layout_panel
+          name="call_btn_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">              
+         	<button
+             follows="left|top"
+             height="20"
+	         image_overlay="call_icon_24x24"
+	         image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Add a voice to this chat"
+             name="call_btn"
+             top="0"
+             width="20" />
+       </layout_panel> 
+       
+       <layout_panel
+          name="end_call_btn_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">       
+         	<button
+             follows="left|top"
+             height="20"
+             image_overlay="call_end_icon_24x24"
+             image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="End Voice Call"
+             name="end_call_btn"
+             top="0"
+             width="20" />
+       </layout_panel>
+       
+       <layout_panel
+          name="voice_ctrls_btn_panel"
+          auto_resize="false"
+          user_resize="false"
+          top="0"
+          layout="topleft"
+          height="20"
+          width="20"
+          follows="left|top">             
+         <button
+             follows="left|top"
+             height="20"
+             image_pressed="PushButton_Press"
+	         image_pressed_selected="PushButton_Selected_Press"
+	         image_selected="PushButton_Selected_Press"
+	         tool_tip="Voice Properties"
+             image_overlay="VoicePTT_Off"
+             name="voice_ctrls_btn"
+             top="0"
+             width="20" />
+        </layout_panel>
+      
+      
+</layout_stack>
+
+ 
+  <layout_stack
+   animate="false" 
+   default_tab_group="2"
+  follows="all"
+  height="300"
+  width="394"
+  layout="topleft"
+  orientation="horizontal"
+  name="im_panels"
+  tab_group="1"
+  top="40"
+  left="0">
+    <layout_panel
+      name="im_control_panel_holder"
+      min_width="115"
+      width="150" 
+      height="320" 
+      auto_resize="false"
+      user_resize="false">
+      <panel
+        name="panel_im_control_panel"
+        layout="topleft"
+        height="320"
+        width="150" 
+        follows="all"/>
+      </layout_panel>
+    <layout_panel
+       default_tab_group="3"
+       left="0"
+       tab_group="2"
+       top="0"
+       height="200"
+	   width="254"
+       user_resize="true">
+
+        <chat_history
+	 font="SansSerifSmall"
+         follows="left|right|top|bottom"
+         height="170"
+         name="chat_history"
+         parse_highlights="true"
+         parse_urls="true"
+        left="1"
+         width="249">
+        </chat_history>
+        <line_editor
+         bottom="0"
+         follows="left|right|bottom"
+	 font="SansSerifSmall"
+         height="20"
+         label="To"
+         layout="bottomleft"
+         name="chat_editor"
+         tab_group="3"
+         width="249">
+        </line_editor>
+    </layout_panel>
+  </layout_stack>
+</floater>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_group_general.xml b/indra/newview/skins/firestorm/xui/en/panel_group_general.xml
new file mode 100644
index 0000000000..01278dcec2
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_general.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ label="General"
+ height="604"
+ width="304"
+ class="panel_group_general"
+ name="general_tab">
+    <panel.string
+     name="help_text">
+        The General tab contains general information about this group, a list of members, general Group Preferences and member options.
+
+Hover your mouse over the options for more help.
+    </panel.string>
+    <panel.string
+     name="group_info_unchanged">
+        General group information has changed
+    </panel.string>
+    <panel.string
+     name="incomplete_member_data_str">
+        Retrieving member data
+    </panel.string>
+   <scroll_container
+      name="group_general_scroll_container"
+      follows="all"
+      height="604"
+      width="304"
+      layout="topleft">
+   <panel
+      name="group_general_scroll_panel"
+      height="604"
+      width="304"
+      follows="left|top"
+      layout="topleft">
+   <panel
+      name="group_info_top"
+      follows="top|left"
+      top="0"
+      left="0"
+      height="129"
+      width="304"
+      layout="topleft">
+    <texture_picker
+     default_image_name="Generic_Group_Large"
+     follows="left|top"
+     height="110"
+     label=""
+     layout="topleft"
+     left="5"
+     name="insignia"
+     no_commit_on_selection="true"
+     tool_tip="Click to choose a picture"
+     top="5"
+     width="100" />
+    <text
+      font="SansSerifSmall"
+      text_color="White_50"
+      width="190"
+      follows="top|left"
+      layout="topleft"
+      mouse_opaque="false"
+     type="string"
+     height="16"
+     length="1"
+     left_pad="8"
+     name="prepend_founded_by"
+     top_delta="0">
+      Founder:
+    </text>
+     <text
+      follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="-2"
+     name="founder_name"
+     top_pad="2"
+     use_ellipses="true"
+     width="168" />
+    <text
+    font="SansSerifMedium"
+    text_color="EmphasisColor"
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="join_cost_text"
+     top_pad="10"
+     visible="true"
+     width="190">
+      Free
+    </text>
+    <button
+     follows="left|top"
+     left_delta="0"
+     top_pad="6"
+     height="23"
+     label="JOIN NOW!"
+     name="btn_join"
+     visible="true"
+     width="120" />
+    </panel>
+    <text_editor
+     type="string"
+     follows="left|top|right"
+     left="3"
+     height="80"
+     layout="topleft"
+     max_length="511"
+     name="charter"
+     top="105"
+     right="-4"
+    bg_readonly_color="DkGray2"
+    text_readonly_color="White"
+     word_wrap="true">
+     Group Charter
+    </text_editor>
+    <name_list
+     column_padding="0"
+     draw_heading="true"
+     follows="left|top|right"
+     heading_height="23"
+     height="160"
+     layout="topleft"
+     left="0"
+     name="visible_members"
+     short_names="false" 
+     top_pad="2">
+        <name_list.columns
+         label="Member"
+         name="name"
+         relative_width="0.4" />
+        <name_list.columns
+         label="Title"
+         name="title"
+         relative_width="0.4" />
+        <name_list.columns
+         label="Status"
+         name="status"
+         relative_width="0.2" />
+      </name_list>
+      <panel
+         background_visible="false"
+         bevel_style="none"
+         border="false"
+         bg_alpha_color="FloaterUnfocusBorderColor"
+         follows="top|left|right"
+         height="240"
+         width="313"
+         layout="topleft"
+         left="0"
+         name="preferences_container"
+         top_pad="5">
+         <text
+         follows="left|top|right"
+         type="string"
+         height="12"
+         layout="left|top|right"
+         left="5"
+         text_color="EmphasisColor"
+         name="my_group_settngs_label"
+         top_pad="10"
+         width="300">
+           Me
+        </text>
+         <text
+         follows="left|top|right"
+         type="string"
+         height="12"
+         layout="left|top|right"
+         left="10"
+         name="active_title_label"
+         top_pad="5"
+         width="300">
+            Current title:
+        </text>
+        <combo_box
+         follows="left|top|right"
+         height="23"
+         layout="topleft"
+         left="10"
+         right="-5"
+         name="active_title"
+         tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."
+         top_pad="2" />
+        <check_box
+         height="16"
+         font="SansSerifSmall"
+         label="Receive group notices"
+         layout="topleft"
+         left="10"
+         name="receive_notices"
+         tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."
+         top_pad="5"
+         width="300" />
+        <check_box
+         height="16"
+         label="Show in my profile"
+         layout="topleft"
+         left="10"
+         name="list_groups_in_profile"
+         tool_tip="Sets whether you want to show this group in your profile"
+         top_pad="5"
+         width="295" />
+        <text
+         follows="left|top|right"
+         type="string"
+         height="12"
+         layout="left|top|right"
+         left="5"
+         text_color="EmphasisColor"
+         name="group_settngs_label"
+         width="300">
+         Group
+        </text>
+        <check_box
+         follows="right|top|left"
+         height="16"
+         label="Anyone can join"
+         layout="topleft"
+         left="10"
+         name="open_enrollement"
+         tool_tip="Sets whether this group allows new members to join without being invited."
+         width="90" />
+        <check_box
+         height="16"
+         label="Cost to join"
+         layout="topleft"
+         left_delta="0"
+         name="check_enrollment_fee"
+         tool_tip="Sets whether to require an enrollment fee to join the group"
+         top_pad="5"
+         width="300" />
+        <spinner
+         decimal_digits="0"
+         follows="left|top"
+         halign="left"
+         height="23"
+         increment="1"
+         label_width="15"
+         label="L$"
+         layout="topleft"
+         max_val="99999"
+         left="30"
+         name="spin_enrollment_fee"
+         tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
+         width="170" />
+        <combo_box
+         follows="left|top"
+         height="23"
+         layout="topleft"
+         left="10"
+         name="group_mature_check"
+         tool_tip="Sets whether your group contains information rated as Moderate"
+         top_pad="4"
+         width="190">
+			<combo_item name="select_mature" value="Select">
+			- Select maturity rating -
+			</combo_item>
+            <combo_box.item
+             label="Moderate Content"
+             name="mature"
+             value="Mature" />
+            <combo_box.item
+             label="General Content"
+             name="pg"
+             value="Not Mature" />
+        </combo_box>
+        <check_box
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         label="Show in search"
+         layout="topleft"
+         left="10"
+         name="show_in_group_list"
+         tool_tip="Let people see this group in search results"
+         top_pad="4"
+         width="300" />
+    </panel>
+</panel>
+    </scroll_container>
+</panel>
\ No newline at end of file
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
new file mode 100644
index 0000000000..ce41dc380e
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+background_visible="true"
+ follows="all"
+ height="570"
+ label="Group Profile"
+ layout="topleft"
+ min_height="350"
+ left="0"
+ top="20"
+ name="GroupInfo"
+ width="313">
+    <panel.string
+     name="default_needs_apply_text">
+        There are unsaved changes
+    </panel.string>
+    <panel.string
+     name="want_apply_text">
+        Do you want to save these changes?
+    </panel.string>
+    <panel.string
+     name="group_join_btn">
+        Join (L$[AMOUNT])
+    </panel.string>
+    <panel.string
+     name="group_join_free">
+        Free
+    </panel.string>
+    <panel
+      name="group_info_top"
+      follows="top|left"
+      top="0"
+      left="0"
+      height="29"
+      width="313"
+      layout="topleft">
+    <button
+     follows="top|right"
+     height="24"
+     image_hover_unselected="BackButton_Over"
+     image_pressed="BackButton_Press"
+     image_unselected="BackButton_Off"
+     layout="topleft"
+     name="back"
+     left="7"
+     tab_stop="false"
+     top="2"
+     width="30"
+     use_draw_context_alpha="false" />
+    <text_editor
+     allow_scroll="false"
+     bg_visible="false"
+     read_only = "true"
+     layout="topleft"
+     name="group_name"
+     v_pad="0"
+     value="(Loading...)"
+      font="SansSerifHugeBold"
+     h_pad="0"
+      height="26"
+      left_pad="8"
+     text_color="LtGray"
+      top="1"
+     use_ellipses="true"
+      width="275"
+      follows="top|left|right"
+      word_wrap="false"
+      mouse_opaque="false"/>
+    <line_editor
+     follows="left|top"
+     font="SansSerif"
+     label="Type your new group name here"
+     layout="topleft"
+     left_delta="10"
+     max_length_bytes="35"
+     name="group_name_editor"
+     top_delta="5"
+     width="270"
+     height="20"
+     visible="false" />
+    </panel>
+   <layout_stack
+     name="layout"
+     orientation="vertical"
+      follows="all"
+     left="8"
+     top_pad="0"
+     height="506"
+     width="292"
+     border_size="0">
+   <layout_panel
+       bg_alpha_color="SL-Background_66"
+       bg_opaque_color="SL-Background_66"
+       background_visible="true"
+       background_opaque="true"
+       name="group_accordions"
+       follows="all"
+       layout="topleft"
+       auto_resize="true"
+       height="513"
+       width="313">
+   <tab_container
+     left="0"
+     top="0"
+     fit_parent="true"
+     follows="all"
+     layout="topleft"
+     name="groups_accordion"
+     height="513"
+     width="313">
+                   <panel
+                      border="false"
+                      class="panel_group_general"
+                      filename="panel_group_general.xml"
+                      layout="topleft"
+                      left="0"
+                      follows="left|top|right"
+                      help_topic="group_general_tab"
+                      name="group_general_tab_panel"
+                      top="0" />
+                <panel
+                   border="false"
+                   class="panel_group_roles"
+                   filename="panel_group_roles.xml"
+                   follows="left|top|right"
+                   layout="topleft"
+                   left="0"
+                   name="group_roles_tab_panel"
+                   top="0" />
+         </accordion_tab>
+         <accordion_tab
+            expanded="false"
+            layout="topleft"
+            name="group_notices_tab"
+            title="Notices"
+            fit_panel="false">
+                <panel
+                    border="false"
+                    class="panel_group_notices"
+                    filename="panel_group_notices.xml"
+                    follows="left|top|right"
+                    layout="topleft"
+                    left="0"
+                    help_topic="group_notices_tab"
+                    name="group_notices_tab_panel"
+                    top="0" />
+                 <panel
+					 border="false"
+                     class="panel_group_land_money"
+                     filename="panel_group_land_money.xml"
+                     follows="left|top|right"
+                     layout="topleft"
+                     left="0"
+                     name="group_land_tab_panel"
+                     top="0" />
+        </tab_container>
+   </layout_panel>
+  </layout_stack>
+   
+   		   <layout_stack
+	     	follows="bottom|left|right"
+			height="25"
+			layout="topleft"
+			name="button_row_ls"
+			left="6"
+			orientation="horizontal"
+			top_pad="5"
+			width="297">
+	
+				<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>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_chat_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="91">
+					<button
+				     follows="bottom|left|right"
+				     label="Chat"
+				     name="btn_chat"
+				     left="1"     
+				     height="23"
+				     top="0"
+				     width="90" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="call_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="91">
+					<button
+			         follows="bottom|left|right"
+			         left="1"
+			         height="23"
+				     name="btn_call"
+				     label="Group Call"
+			         layout="topleft"
+			         tool_tip="Call this group"
+			         top="0"
+			         width="90" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_apply_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="91">
+					<button
+				     follows="bottom|left|right"
+				     height="23"
+				     label="Save"
+				     label_selected="Save"
+				     name="btn_apply"
+				     left="1"
+				     top="0"
+				     width="90" />
+					<button
+    				 follows="bottom|left|right"
+	                 height="23"
+	                 layout="topleft"
+	                 left="1"
+	                 top="0"
+	                 label="Create Group"
+     				 name="btn_create"
+               		 visible="true"
+                 	 tool_tip="Create a new Group"
+                 	 width="90" />	
+				</layout_panel>
+		   </layout_stack>
+  
+</panel>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_group_land_money.xml b/indra/newview/skins/firestorm/xui/en/panel_group_land_money.xml
new file mode 100644
index 0000000000..cc4eaf4fe6
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_land_money.xml
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ height="500"
+ label="Land &amp; L$"
+ layout="topleft"
+ left="0"
+ name="land_money_tab"
+ top="0"
+ width="304">
+    <panel.string
+     name="help_text">
+   A warning appears until the Total Land in Use is less than or = to the Total Contribution.
+    </panel.string>
+    <panel.string
+     name="cant_view_group_land_text">
+        You don&apos;t have permission to view group owned land
+    </panel.string>
+    <panel.string
+     name="epmty_view_group_land_text">
+        No entries
+    </panel.string>
+    <panel.string
+     name="cant_view_group_accounting_text">
+        You don&apos;t have permission to view the group&apos;s accounting information.
+    </panel.string>
+    <panel.string
+     name="loading_txt">
+        Loading...
+    </panel.string>
+    <panel.string
+     name="land_contrib_error">
+        Unable to set your land contribution
+    </panel.string>
+   <!-- <text
+     type="string"
+     follows="left|top"
+     font="SansSerifBig"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="group_land_heading"
+     top_pad="10"
+     width="260">
+        Group Owned Land
+    </text> -->
+
+    <scroll_container
+     name="group_land_scroll_container"
+     width="304"
+     height="500"
+     layout="topleft"
+     follows="all">
+    <panel
+     name="group_land_scroll_panel"
+     width="304"
+     height="500"
+     follows="left|top">
+   <panel
+          name="layout_panel_landmoney"
+          follows="top|left|right"
+          left="0"
+          right="-1"
+          height="250"
+          width="313"
+          >
+    <scroll_list
+     draw_heading="true"
+     follows="top|left|right"
+     height="130"
+     layout="topleft"
+     left="0"
+     right="-1"
+     top="0"
+     sort_column="0"
+     sort_ascending="true"
+     name="group_parcel_list"
+     width="313">
+        <scroll_list.columns
+         label="Parcel"
+         name="name"
+         width="47" />
+        <scroll_list.columns
+         label="Region"
+         name="location"
+         width="47" />
+        <scroll_list.columns
+         label="Type"
+         name="type"
+         width="47" />
+        <scroll_list.columns
+         label="Area"
+         name="area"
+         width="47" />
+        <scroll_list.columns
+         label="Hidden"
+         name="hidden"
+         width="47" />
+    </scroll_list>
+    <text
+     type="string"
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="0"
+     name="total_contributed_land_label"
+     width="130">
+        Total contribution:
+    </text>
+    <text
+    text_color="EmphasisColor"
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     name="total_contributed_land_value"
+     top_delta="0"
+     width="90">
+        [AREA] m²
+    </text>
+    <button
+     follows="top"
+     height="23"
+     label="Map"
+     label_selected="Map"
+     layout="topleft"
+     name="map_button"
+     top_delta="-4"
+     left_pad="0"
+     width="60"
+     enabled="false" />
+    <text
+     type="string"
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="0"
+     name="total_land_in_use_label"
+     top_pad="0"
+     width="130">
+        Total land in use:
+    </text>
+    <text
+    text_color="EmphasisColor"
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     name="total_land_in_use_value"
+     top_delta="0"
+     width="120">
+        [AREA] m²
+    </text>
+    <text
+     type="string"
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="0"
+     name="land_available_label"
+     top_pad="0"
+     width="130">
+        Land available:
+    </text>
+    <text
+    text_color="EmphasisColor"
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     name="land_available_value"
+     top_delta="0"
+     width="120">
+        [AREA] m²
+    </text>
+    <text
+     type="string"
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="0"
+     name="your_contribution_label"
+     top_pad="0"
+     width="130">
+        Your contribution:
+    </text>
+    <line_editor
+     follows="left|top"
+     height="19"
+     layout="topleft"
+     left_pad="5"
+     max_length="10"
+     name="your_contribution_line_editor"
+     top_delta="0"
+     width="80" />
+    <text
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     name="your_contribution_units"
+     top_delta="2"
+     width="40"
+      >
+        m²
+    </text>
+     <text
+     type="string"
+     follows="left|top"
+     halign="left"
+     height="16"
+     layout="topleft"
+     left="140"
+     name="your_contribution_max_value"
+     top_pad="2"
+     width="170">
+        ([AMOUNT] max)
+    </text>
+    <icon
+     height="16"
+     image_name="Parcel_Exp_Color"
+     layout="topleft"
+     left="75"
+     name="group_over_limit_icon"
+     color="Green"
+     top_pad="0"
+     visible="true"
+     width="18" />
+    <text
+     follows="left|top"
+     type="string"
+     word_wrap="true"
+     height="20"
+     layout="topleft"
+     left_pad="2"
+     name="group_over_limit_text"
+     text_color="ColorPaletteEntry29"
+     top_delta="0"
+     width="213">
+        More land credits are needed to support land in use
+    </text>
+    <text
+     type="string"
+     follows="left|top"
+     font="SansSerifBig"
+     height="16"
+     layout="topleft"
+     left="0"
+     name="group_money_heading"
+     text_color="EmphasisColor"
+     top_pad="-15"
+     width="100">
+        Group L$
+    </text>
+    </panel>
+    <tab_container
+     follows="all"
+     height="230"
+     halign="center"
+     layout="topleft"
+     left="0"
+     right="-1"
+     name="group_money_tab_container"
+     tab_position="top"
+     top_pad="2"
+     tab_min_width="90"
+     width="313">
+        <panel
+         border="false"
+         follows="all"
+         label="PLANNING"
+         layout="topleft"
+         left="0"
+         help_topic="group_money_planning_tab"
+         name="group_money_planning_tab"
+         top="0"
+         width="313">
+            <text_editor
+             enabled="false"
+             type="string"
+             follows="all"
+             height="200"
+             layout="topleft"
+             left="0"
+             max_length="4096"
+             name="group_money_planning_text"
+             top="2"
+             width="313"
+             word_wrap="true">
+                Loading...
+            </text_editor>
+        </panel>
+      <panel
+         border="false"
+         follows="all"
+         label="DETAILS"
+         layout="topleft"
+         left="0"
+         help_topic="group_money_details_tab"
+         name="group_money_details_tab"
+         top="0"
+         width="313">
+          <text_editor
+             enabled="false"
+             type="string"
+             follows="all"
+             height="185"
+             layout="topleft"
+             left="0"
+             max_length="4096"
+             name="group_money_details_text"
+             top="2"
+             width="313"
+             word_wrap="true">
+                Loading...
+            </text_editor>
+            <button
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Arrow_Left_Off"
+	     layout="topleft"
+	     name="earlier_details_button"
+	     tool_tip="Back"
+             left="200"
+             top_pad="0"
+	     width="25" />
+             <button
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Arrow_Right_Off"
+	     layout="topleft"
+       name="later_details_button"
+	     tool_tip="Next"
+             left_pad="15"
+	     width="25" />
+        </panel>
+      <panel
+         border="false"
+         follows="all"
+         label="SALES"
+         layout="topleft"
+         left="0"
+         help_topic="group_money_sales_tab"
+         name="group_money_sales_tab"
+         top="0"
+         width="313">
+            <text_editor
+             enabled="false"
+             type="string"
+             follows="all"
+             height="185"
+             layout="topleft"
+             left="0"
+             max_length="4096"
+             name="group_money_sales_text"
+             top="2"
+             width="313"
+             word_wrap="true">
+                Loading...
+            </text_editor>
+           <button
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Arrow_Left_Off"
+	     layout="topleft"
+	     name="earlier_sales_button"
+	     tool_tip="Back"
+             left="200"
+             top_pad="0"
+	     width="25" />
+             <button
+	     follows="left|top"
+	     height="18"
+	     image_overlay="Arrow_Right_Off"
+	     layout="topleft"
+	     left_pad="15"
+         name="later_sales_button"
+	     tool_tip="Next"
+	     width="25" />
+        </panel>
+    </tab_container>
+</panel>
+    </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/firestorm/xui/en/panel_group_notices.xml b/indra/newview/skins/firestorm/xui/en/panel_group_notices.xml
new file mode 100644
index 0000000000..cfda09cec2
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_notices.xml
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="530"
+ label="Notices"
+ layout="topleft"
+ left="0"
+ name="notices_tab"
+ top="0"
+ width="304">
+    <panel.string
+     name="help_text">
+        Notices let you send a message and an optionally attached item.
+Notices only go to group members in Roles with the ability to receive Notices.
+You can turn off Notices on the General tab.
+    </panel.string>
+    <panel.string
+     name="no_notices_text">
+        There are no past notices
+    </panel.string>
+    <scroll_container
+     name="group_notices_scroll_container"
+     width="304"
+     height="530"
+     layout="topleft"
+     follows="all">
+    <panel
+     name="group_notices_scroll_panel"
+     width="304"
+     height="530"
+     follows="left|top">
+    <text
+      follows="left|top"
+     type="string"
+     word_wrap="true"
+     height="24"
+     halign="left"
+     layout="topleft"
+     text_color="White_50"
+     left="5"
+     name="lbl2"
+     right="-1"
+     top="5"
+     width="300">
+     Notices are kept for 14 days.
+Maximum 200 per group daily
+    </text>
+    <scroll_list
+     follows="left|top|right"
+     column_padding="0"
+     draw_heading="true"
+     height="175"
+     layout="topleft"
+     left="0"
+     right="-1"
+     name="notice_list"
+     top_pad="0"
+     width="304">
+        <scroll_list.columns
+         label=""
+         name="icon"
+         width="20" />
+        <scroll_list.columns
+         label="Subject"
+         name="subject"
+         width="110" />
+        <scroll_list.columns
+         label="From"
+         name="from"
+         width="100" />
+        <scroll_list.columns
+         label="Date"
+         name="date"
+         width="60" />
+        <scroll_list.columns
+         name="sort"
+         width="-1" />
+    </scroll_list>
+    <text
+     follows="left|top"
+     type="string"
+     layout="topleft"
+     name="notice_list_none_found"
+     visible="false">
+        None found
+    </text>
+      <button
+       follows="top|left"
+       height="23"
+       image_overlay="AddItem_Off"
+       image_overlay_alignment="left"
+       imgoverlay_label_space="-10"
+       label="New Notice"
+       layout="topleft"
+       left="5"
+       name="create_new_notice"
+       tool_tip="Create a new notice"
+       top_delta="0"
+       width="93" />
+     <button
+     follows="top|left"
+     height="23"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     name="refresh_notices"
+     left="260"
+     tool_tip="Refresh list of notices"
+     top_delta="0"
+     width="23" />
+    <panel
+     follows="left|top|right"
+     height="280"
+     label="Create New Notice"
+     layout="topleft"
+     left="0"
+     right="-1"
+     top_pad="0"
+     visible="true"
+     name="panel_create_new_notice"
+         width="313">
+        <text
+         follows="left|top"
+         type="string"
+         font="SansSerifBig"
+         height="16"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="lbl"
+         text_color="EmphasisColor"
+         top="5"
+         width="200">
+            Create a Notice
+        </text>
+        <text
+         follows="left|top"
+         type="string"
+         halign="left"
+         height="16"
+         layout="topleft"
+         name="lbl3"
+         top_pad="10"
+         width="60">
+            Subject:
+        </text>
+        <line_editor
+         follows="left|top|right"
+         border_style="line"
+         border_thickness="1"
+         height="16"
+         layout="topleft"
+         left_pad="3"
+         max_length="63"
+         name="create_subject"
+         prevalidate_callback="ascii"
+         width="220" />
+        <text
+         follows="left|top"
+         type="string"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="lbl4"
+         top_pad="5"
+         width="60">
+            Message:
+        </text>
+        <text_editor
+         follows="left|top|right"
+         height="90"
+         layout="topleft"
+         left_pad="3"
+         max_length="511"
+         name="create_message"
+         top_delta="0"
+         width="220"
+         word_wrap="true" />
+        <text
+         follows="left|top"
+         type="string"
+         halign="left"
+         height="14"
+         layout="topleft"
+         left="10"
+         name="lbl5"
+         width="200">
+            Attach:
+        </text>
+        <line_editor
+         follows="left|top|right"
+         enabled="false"
+         height="19"
+         layout="topleft"
+         max_length="90"
+         mouse_opaque="false"
+         name="create_inventory_name"
+         top_pad="2"
+         width="285" />
+        <text
+        text_color="EmphasisColor"
+         follows="left|top"
+         type="string"
+         halign="right"
+         height="34"
+         layout="topleft"
+         left="10"
+         name="string"
+         top_pad="15"
+         word_wrap="true"
+         width="150">
+            Drag and drop item here to attach it:
+        </text>
+        <icon
+         height="72"
+         image_name="DropTarget"
+         layout="topleft"
+         left_pad="10"
+         mouse_opaque="true"
+         name="drop_icon"
+         top_delta="-10"
+         width="72" />
+        <button
+         follows="left|top"
+         layout="topleft"
+         left="20"
+         top_delta="50"
+         height="23"
+         width="100"
+         name="open_inventory"
+         label="Inventory"
+         tool_tip="Open Inventory">
+			<button.init_callback
+				 function="Button.SetFloaterToggle"
+				 parameter="inventory"/>
+		</button>
+        <button
+         follows="left|top"
+         layout="topleft"
+         left="140"
+         name="remove_attachment"
+         top_delta="0"
+                 height="18"
+                 image_selected="TrashItem_Press"
+                 image_unselected="TrashItem_Off"
+                 image_disabled="TrashItem_Disabled"
+                 tool_tip="Remove attachment from your notification"
+                 width="18" />
+        <button
+         follows="left|top"
+         height="23"
+         label="Send"
+         label_selected="Send"
+         layout="topleft"
+         right="-25"
+         top_pad="10"
+         name="send_notice"
+         width="100" />
+      <group_drop_target
+         height="75"
+         top="160"
+         left="10"
+         layout="topleft"
+         name="drop_target"
+         tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it."
+         width="280" />
+   </panel>
+    <panel
+     follows="left|top|right"
+     height="280"
+     label="View Past Notice"
+     layout="topleft"
+     left="0"
+     right="-1"
+     visible="false"
+     name="panel_view_past_notice"
+     top="230"
+    width="313">
+        <text
+         type="string"
+         font="SansSerifMedium"
+         height="16"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="lbl"
+         text_color="EmphasisColor"
+         top_pad="5"
+         width="265">
+            Archived Notice
+        </text>
+        <text
+         type="string"
+         height="16"
+         word_wrap="true"
+         layout="topleft"
+         left_delta="0"
+         name="lbl2"
+         top_pad="2"
+         width="265">
+            To send a new notice, click the + button
+        </text>
+        <text
+         type="string"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left_delta="0"
+         name="lbl3"
+         top_pad="15"
+         visible="false"
+         width="60">
+            Subject:
+        </text>
+        <line_editor
+         border_style="line"
+         border_thickness="1"
+         enabled="false"
+         height="20"
+         layout="topleft"
+         left_pad="3"
+         max_length="63"
+         name="view_subject"
+         top_delta="-1"
+         visible="false"
+         width="200" />
+        <text
+         type="string"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="lbl4"
+         top_pad="10"
+         visible="false"
+         width="60">
+            Message:
+        </text>
+        <text_editor
+                     follows="top|left|right"
+         enabled="false"
+         height="160"
+         layout="topleft"
+         left="0"
+         right="-1"
+         max_length="511"
+         name="view_message"
+         top_delta="-40"
+         width="313"
+         word_wrap="true" />
+        <line_editor
+         enabled="false"
+         height="20"
+         layout="topleft"
+         left="5"
+         max_length="63"
+         mouse_opaque="false"
+         name="view_inventory_name"
+         top_pad="8"
+         width="250"/>
+        <button
+         follows="left|top"
+         height="23"
+         label="Open Attachment"
+         layout="topleft"
+         left="5"
+         name="open_attachment"
+         top_pad="5"
+         width="180" />
+        </panel>
+</panel>
+    </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/firestorm/xui/en/panel_group_roles.xml b/indra/newview/skins/firestorm/xui/en/panel_group_roles.xml
new file mode 100644
index 0000000000..67252c45be
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_group_roles.xml
@@ -0,0 +1,600 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="680"
+ label="Members &amp; Roles"
+ layout="topleft"
+ left="0"
+ top="0"
+ name="roles_tab"
+ width="304">
+    <panel.string
+     name="default_needs_apply_text">
+        There are unsaved changes
+    </panel.string>
+    <panel.string
+     name="want_apply_text">
+        Do you want to save your changes?
+    </panel.string>
+    <panel.string
+     name="help_text" />
+    <scroll_container
+     name="group_members_members_scroll_container"
+     width="304"
+     height="680"
+     layout="topleft"
+     follows="all">
+    <panel
+     name="group_members_members_scroll_panel"
+     width="284"
+     height="680"
+     follows="left|top|right">
+    <tab_container
+    border="false"
+     follows="left|top|right"
+     height="552"
+     halign="center"
+     layout="topleft"
+     left="0"
+     right="-1"
+     name="roles_tab_container"
+     tab_position="top"
+     tab_height="22"
+     tab_min_width="90"
+     top="0"
+     width="304">
+        <panel
+         border="false"
+         follows="all"
+         height="303"
+         label="MEMBERS"
+         layout="topleft"
+         left="0"
+         right="-1"
+         help_topic="roles_members_tab"
+         name="members_sub_tab"
+         tool_tip="Members"
+         class="panel_group_members_subtab">
+            <panel.string
+             name="help_text">
+                You can add or remove Roles assigned to Members.
+Select multiple Members by holding the Ctrl key and
+clicking on their names.
+            </panel.string>
+            <panel.string
+             name="donation_area">
+                [AREA] m²
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+         <filter_editor
+         layout="topleft"
+         top="5"
+         left="5"
+         right="-5"
+         height="22"
+         search_button_visible="false"
+         follows="left|top|right"
+         label="Filter Members"
+         name="filter_input" />
+            <name_list
+             column_padding="2"
+             draw_heading="true"
+             height="240"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             multi_select="true"
+             name="member_list"
+             short_names="false" 
+             top_pad="5">
+                <name_list.columns
+                 label="Member"
+                 name="name"
+               relative_width="0.44" />
+                <name_list.columns
+                 label="Donation"
+                 name="donated"
+         relative_width="0.25" />
+                <name_list.columns
+                 label="Status"
+                 name="online"
+                 relative_width="0.14" />
+            </name_list>
+            <button
+             height="23"
+             follows="top|left"
+             label="Invite"
+             left="5"
+             name="member_invite"
+             width="100" />
+            <button
+             height="23"
+             label="Eject"
+             follows="top|left"
+             left_pad="10"
+             name="member_eject"
+             width="100" />
+        </panel>
+        <panel
+         border="false"
+         height="303"
+         label="ROLES"
+         layout="topleft"
+         left="0"
+         right="-1"
+         help_topic="roles_roles_tab"
+         name="roles_sub_tab"
+         class="panel_group_roles_subtab">
+           <!-- <button
+             enabled="false"
+             height="20"
+             label="Show All"
+             layout="topleft"
+             top="-65"
+             right="-5"
+             name="show_all_button"
+             width="100" />-->
+            <panel.string
+             name="help_text">
+                Roles have a title and an allowed list of Abilities
+that Members can perform. Members can belong to
+one or more Roles. A group can have up to 10 Roles,
+including the Everyone and Owner Roles.
+            </panel.string>
+            <panel.string
+             name="cant_delete_role">
+                The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+         <filter_editor
+         layout="topleft"
+         top="5"
+         left="5"
+         right="-5"
+         height="22"
+         search_button_visible="false"
+         follows="left|top|right"
+         label="Filter Roles"
+         name="filter_input" />
+            <scroll_list
+             column_padding="0"
+             draw_heading="true"
+             draw_stripes="false"
+             heading_height="23"
+             height="130"
+             layout="topleft"
+             search_column="1"
+             left="0"
+             follows="left|top|right"
+             right="-1"
+             name="role_list"
+             top_pad="2"
+             width="310">
+                <scroll_list.columns
+                 label="Role"
+                 name="name"
+               relative_width="0.45"  />
+                <scroll_list.columns
+                 label="Title"
+                 name="title"
+               relative_width="0.45"  />
+                <scroll_list.columns
+                 label="#"
+                 name="members"
+               relative_width="0.15"  />
+            </scroll_list>
+            <button
+            follows="top|left"
+             height="23"
+             label="New Role"
+             layout="topleft"
+             left="0"
+             name="role_create"
+             width="120" />
+            <button
+             height="23"
+             follows="top|left"
+             label="Delete Role"
+             layout="topleft"
+             left_pad="10"
+             name="role_delete"
+             width="120" />
+        </panel>
+        <panel
+         border="false"
+         height="303"
+         label="ABILITIES"
+         layout="topleft"
+         left="0"
+         right="-1"
+         help_topic="roles_actions_tab"
+         name="actions_sub_tab"
+         class="panel_group_actions_subtab"
+         tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability."
+         width="310">
+            <panel.string
+             name="help_text">
+                Abilities allow Members in Roles to do specific
+things in this group. There&apos;s a broad variety of Abilities.
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+         <filter_editor
+         layout="topleft"
+         top="5"
+         left="5"
+         right="-5"
+         height="22"
+         search_button_visible="false"
+         follows="left|top|right"
+         label="Filter Abilities"
+         name="filter_input" />
+        <scroll_list
+         column_padding="0"
+         draw_stripes="true"
+         height="200"
+         follows="left|top|right"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="action_list"
+         search_column="2"
+         tool_tip="Select an Ability to view more details"
+         top_pad="5"
+         width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="action"
+             width="270" />
+        </scroll_list>
+        </panel>
+    </tab_container>
+    <panel
+     height="350"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
+     layout="topleft"
+     follows="top|left|right"
+     left="0"
+     right="-1"
+     width="313"
+     mouse_opaque="false"
+     name="members_footer"
+     top="325"
+     visible="false">
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top="8"
+         text_color="EmphasisColor"
+         name="static"
+         width="300">
+            Assigned Roles
+        </text>
+        <scroll_list
+         draw_stripes="true"
+        follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="member_assigned_roles"
+         top_pad="0">
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="role"
+             width="270" />
+        </scroll_list>
+          <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top_pad="5"
+         text_color="EmphasisColor"
+         name="static2"
+         width="285">
+            Allowed Abilities
+        </text>
+        <scroll_list
+         draw_stripes="true"
+             follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="member_allowed_actions"
+         search_column="2"
+         tool_tip="For details of each allowed ability see the abilities tab"
+         top_pad="0">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="action"
+             width="270" />
+        </scroll_list>
+    </panel>
+    <panel
+     height="550"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
+     layout="topleft"
+     follows="top|left|right"
+     left="0"
+     right="-1"
+     width="313"
+     mouse_opaque="false"
+     name="roles_footer"
+     top_delta="0"
+     top="209"
+     visible="false">
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top="5"
+         name="static"
+         width="300">
+           Role Name
+        </text>
+        <line_editor
+         type="string"
+         height="20"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length="20"
+         name="role_name"
+         top_pad="0"
+         width="300">
+        </line_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static3"
+         top_pad="5"
+         width="300">
+           Role Title
+        </text>
+        <line_editor
+         type="string"
+         height="20"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length="20"
+         name="role_title"
+         top_pad="0"
+         width="300">
+        </line_editor>
+               <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static2"
+         top_pad="5"
+         width="200">
+            Description
+        </text>
+        <text_editor
+         type="string"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length="295"
+         height="35"
+         name="role_description"
+         top_pad="0"
+         width="300"
+         word_wrap="true">
+        </text_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         text_color="EmphasisColor"
+         name="static4"
+         top_pad="5"
+         width="300">
+            Assigned Members
+        </text>
+        <name_list
+         draw_stripes="true"
+         height="128"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         name="role_assigned_members"
+         top_pad="0"
+         width="300" />
+        <check_box
+         height="15"
+         label="Reveal members"
+         left="5"
+         layout="topleft"
+         name="role_visible_in_list"
+         tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
+         top_pad="4"
+         width="300" />
+         <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         text_color="EmphasisColor"
+         name="static5"
+         top_pad="2"
+         width="300">
+            Allowed Abilities
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         height="140"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         name="role_allowed_actions"
+         search_column="2"
+         tool_tip="For details of each allowed ability see the abilities tab"
+         top_pad="0"
+         width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="action"
+             width="270" />
+        </scroll_list>
+    </panel>
+   <panel
+     height="424"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
+     layout="topleft"
+     follows="top|left|right"
+     left="0"
+     right="-1"
+     width="313"
+     mouse_opaque="false"
+     name="actions_footer"
+     top_delta="0"
+     top="255"
+     visible="false">
+        <text_editor
+       bg_readonly_color="Transparent"
+       text_readonly_color="EmphasisColor"
+       font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="action_description"
+         top="0"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static2"
+         top_pad="1"
+         width="300">
+            Roles with this ability
+        </text>
+        <scroll_list
+         height="172"
+         layout="topleft"
+         follows="left|top|right"
+         left="5"
+         right="-1"
+         name="action_roles"
+         top_pad="0"
+         width="300" />
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static3"
+         top_pad="5"
+         width="300">
+            Members with this ability
+        </text>
+        <name_list
+         height="122"
+         follows="left|top|right"
+         layout="topleft"
+         left="5"
+         right="-1"
+         name="action_members"
+         top_pad="0"
+         width="300" />
+    </panel>
+</panel>
+    </scroll_container>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/firestorm/xui/en/widgets/button.xml b/indra/newview/skins/firestorm/xui/en/widgets/button.xml
new file mode 100644
index 0000000000..5b22630441
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/widgets/button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Additional attributes:
+  image_pressed
+	image_pressed_selected
+  image_flash
+   -->
+<button image_unselected="PushButton_Off"
+        image_selected="PushButton_Selected"
+        image_disabled_selected="PushButton_Selected_Disabled"
+        image_disabled="PushButton_Disabled"
+        image_top_pad="0"
+        image_bottom_pad="0"
+        imgoverlay_label_space="1"
+        label_color="ButtonLabelColor"
+        label_color_selected="ButtonLabelSelectedColor"
+        label_color_disabled="ButtonLabelDisabledColor"
+        label_color_disabled_selected="ButtonLabelSelectedDisabledColor"
+        highlight_color="ButtonUnselectedFgColor"
+        image_color="ButtonImageColor"
+        image_color_disabled="ButtonImageColor"
+        flash_color="ButtonFlashBgColor"
+	font="SansSerifSmall"
+        hover_glow_amount="0.25"
+        halign="center"
+        pad_bottom="3" 
+        height="23"
+        scale_image="true">
+</button>