Merge

1 files changed, 319 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
new file mode 100644
index 0000000000..04dbf73be9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="top|left"
+ height="320"
+ help_topic="panel_region_texture_tab"
+ label="Ground Textures"
+ layout="topleft"
+ left="0"
+ name="Textures"
+ top="320"
+ width="480">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="region_text_lbl"
+     top="10"
+     width="100">
+        Region:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="region_text"
+     top_delta="0"
+     width="400">
+        unknown
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="detail_texture_text"
+     top="36"
+     width="300">
+        Terrain Textures (requires 512x512, 24 bit .tga files)
+    </text>
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_delta="0"
+     name="texture_detail_0"
+     top_delta="20"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_1"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_2"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_3"
+     top_delta="0"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl"
+     top="146"
+     width="65">
+        1 (Low)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="45"
+     name="height_text_lbl2"
+     top_delta="0"
+     width="100">
+        2
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl3"
+     top_delta="0"
+     width="100">
+        3
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl4"
+     top_delta="0"
+     width="100">
+        4 (High)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl5"
+     top="170"
+     width="300">
+        Texture Elevation Ranges
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl6"
+     top="185"
+     width="100">
+        Southwest
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl7"
+     top_delta="0"
+     width="100">
+        Northwest
+    </text>
+   <spinner
+    follows="left|top"
+    height="20"
+    increment="0.5"
+    label="Low"
+    label_width="37"
+    layout="topleft"
+    left="10"
+    max_val="500"
+    min_val="-500"
+    name="height_start_spin_0"
+    top_delta="15"
+    width="100" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="Low"
+   label_width="37"
+   layout="topleft"
+   left_pad="10"
+   max_val="500"
+   min_val="-500"
+   name="height_start_spin_1"
+   top_delta="0"
+   width="100" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="High"
+   label_width="37"
+   layout="topleft"
+   left="10"
+   max_val="500"
+   min_val="-500"
+   name="height_range_spin_0"
+   top_delta="20"
+   width="100" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="High"
+   label_width="37"
+   layout="topleft"
+   left_pad="10"
+   max_val="500"
+   min_val="-500"
+   name="height_range_spin_1"
+   top_delta="0"
+   width="100" />
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl8"
+     top_pad="10"
+     width="100">
+        Southeast
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Northeast
+    </text>
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_2"
+       top_delta="15"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="Low"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_start_spin_3"
+       top_delta="0"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_2"
+       top_delta="20"
+       width="100" />
+      <spinner
+       follows="left|top"
+       height="20"
+       increment="0.5"
+       label="High"
+       label_width="37"
+       layout="topleft"
+       left_pad="10"
+       max_val="500"
+       min_val="-500"
+       name="height_range_spin_3"
+       top_delta="0"
+       width="100" />
+      <text
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="height_text_lbl10"
+       top_delta="30"
+       width="400"
+       word_wrap="true">
+        These values represent the blend range for the textures above.
+      </text>
+      <text
+       follows="left|top"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="height_text_lbl11"
+       top_delta="32"
+       width="400"
+       word_wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
+      </text>
+    <button
+     enabled="false"
+     follows="left|bottom"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="350"
+     name="apply_btn"
+     top="290"
+     width="100" />
+</panel>