Merge

1 files changed, 267 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
new file mode 100644
index 0000000000..41e53be29e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ label="General"
+ follows="all"
+ height="604"
+ width="303"
+ 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>
+   <panel
+      name="group_info_top"
+      follows="top|left"
+      top="0"
+      left="0"
+      height="129"
+      width="313"
+      layout="topleft">
+    <texture_picker
+     follows="left|top"
+     height="110"
+     label=""
+     layout="topleft"
+     left="10"
+     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="10"
+     name="prepend_founded_by"
+     top_delta="0">
+      Founder:
+    </text>
+    <name_box
+     follows="left|top"
+     height="16"
+     initial_value="(retrieving)"
+     layout="topleft"
+     left_delta="0"
+     link="true"
+     name="founder_name"
+     top_pad="2"
+     use_ellipses="true"
+     width="190" />
+    <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="5"
+     height="80"
+     layout="topleft"
+     max_length="511"
+     name="charter"
+     top="105"
+     right="-1"
+    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"
+     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>
+         <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">
+            My 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" />
+   <panel
+         background_visible="false"
+         bevel_style="none"
+         border="false"
+         bg_alpha_color="FloaterUnfocusBorderColor"
+         follows="left|top|right"
+         height="140"
+         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="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_box.item
+             label="General Content"
+             name="pg"
+             value="Not Mature" />
+             <combo_box.item
+             label="Moderate Content"
+             name="mature"
+             value="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>