Merge

1 files changed, 366 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
new file mode 100644
index 0000000000..38b0f234d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ follows="all"
+ height="500"
+ label="Land &amp; L$"
+ layout="topleft"
+ left="0"
+ name="land_money_tab"
+ top="0"
+ width="313">
+    <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="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> -->
+   <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"
+     name="group_parcel_list"
+     width="313">
+        <scroll_list.columns
+         label="Parcel"
+         name="name"
+         width="78" />
+        <scroll_list.columns
+         label="Region"
+         name="location"
+         width="78" />
+        <scroll_list.columns
+         label="Type"
+         name="type"
+         width="70" />
+        <scroll_list.columns
+         label="Area"
+         name="area"
+         width="50" />
+    </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
+             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
+             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
+             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>