viewer2 merge.

1 files changed, 498 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
new file mode 100644
index 0000000000..32739ac953
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -0,0 +1,498 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="240"
+ layout="topleft"
+ name="Water Floater"
+ help_topic="water_floater"
+ save_rect="true"
+ title="ADVANCED WATER EDITOR"
+ width="700">
+    <floater.string
+     name="WLDefaultWaterNames">
+        Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font.style="BOLD"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="KeyFramePresetsText"
+     top="34"
+     width="110">
+        Water Presets:
+    </text>
+    <combo_box
+     height="18"
+     layout="topleft"
+     left_pad="10"
+     name="WaterPresetsCombo"
+     top_delta="-2"
+     width="150" />
+    <button
+     height="20"
+     label="New"
+     label_selected="New"
+     layout="topleft"
+     left_pad="20"
+     name="WaterNewPreset"
+     top_delta="1"
+     width="90" />
+    <button
+     height="20"
+     label="Save"
+     label_selected="Save"
+     layout="topleft"
+     left_pad="10"
+     name="WaterSavePreset"
+     top_delta="0"
+     width="90" />
+    <button
+     height="20"
+     label="Delete"
+     label_selected="Delete"
+     layout="topleft"
+     left_pad="10"
+     name="WaterDeletePreset"
+     top_delta="0"
+     width="90" />
+    <tab_container
+    border="false"
+     follows="left|top"
+     height="180"
+     halign="center"
+     layout="topleft"
+     left="0"
+     name="Water Tabs"
+     tab_position="top"
+     top="60"
+     width="700">
+        <panel
+         border="true"
+         follows="all"
+         height="180"
+         label="Settings"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         help_topic="water_settings_tab"
+         name="Settings"
+         top="0"
+         width="698">
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="BHText"
+             top="4"
+             width="200">
+                Water Fog Color
+            </text>
+            <color_swatch
+             can_apply_immediately="true"
+             color="0.5 0.5 0.5 1"
+             follows="left|top"
+             height="50"
+             layout="topleft"
+             left="40"
+             name="WaterFogColor"
+             tool_tip="Click to open color picker"
+             top="30"
+             width="40" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="WaterFogDensText"
+             top="84"
+             width="200">
+                Fog Density Exponent
+            </text>
+            <slider
+             control_name="WaterFogDensity"
+             decimal_digits="1"
+             follows="left"
+             height="10"
+             initial_value="16"
+             layout="topleft"
+             left="24"
+             max_val="10"
+             name="WaterFogDensity"
+             top="124"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-14"
+             name="WaterUnderWaterFogModText"
+             top="124"
+             width="200">
+                Underwater Fog Modifier
+            </text>
+            <slider
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="16"
+             layout="topleft"
+             left="24"
+             max_val="2"
+             name="WaterUnderWaterFogMod"
+             top="164"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BDensText"
+             top="4"
+             width="200">
+                Reflection Wavelet Scale
+            </text>
+            <slider
+             control_name="WaterNormalScaleX"
+             decimal_digits="1"
+             follows="left"
+             height="15"
+             initial_value="0.7"
+             label="1"
+             layout="topleft"
+             max_val="10"
+             name="WaterNormalScaleX"
+             top_pad="24"
+             width="200" />
+            <slider
+             control_name="WaterNormalScaleY"
+             decimal_digits="1"
+             follows="left"
+             height="15"
+             initial_value="0.7"
+             label="2"
+             layout="topleft"
+             max_val="10"
+             name="WaterNormalScaleY"
+             top_pad="4"
+             width="200" />
+            <slider
+             control_name="WaterNormalScaleZ"
+             decimal_digits="1"
+             follows="left"
+             height="15"
+             initial_value="0.7"
+             label="3"
+             layout="topleft"
+             max_val="10"
+             name="WaterNormalScaleZ"
+             top_pad="4"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             name="HDText"
+             top="84"
+             width="200">
+                Fresnel Scale
+            </text>
+            <slider
+             control_name="WaterFresnelScale"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             name="WaterFresnelScale"
+             top="124"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             name="FresnelOffsetText"
+             top="124"
+             width="200">
+                Fresnel Offset
+            </text>
+            <slider
+             control_name="WaterFresnelOffset"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             name="WaterFresnelOffset"
+             top="164"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="480"
+             name="DensMultText"
+             top="4"
+             width="200">
+                Refract Scale Above
+            </text>
+            <slider
+             control_name="WaterScaleAbove"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.1"
+             layout="topleft"
+             left="494"
+             name="WaterScaleAbove"
+             top="44"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-14"
+             name="WaterScaleBelowText"
+             top="44"
+             width="200">
+                Refract Scale Below
+            </text>
+            <slider
+             control_name="WaterScaleBelow"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0"
+             layout="topleft"
+             left="494"
+             name="WaterScaleBelow"
+             top="84"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-14"
+             name="MaxAltText"
+             top="84"
+             width="200">
+                Blur Multiplier
+            </text>
+            <slider
+             control_name="WaterBlurMult"
+             follows="left"
+             height="10"
+             increment="0.001"
+             initial_value="0"
+             layout="topleft"
+             left="494"
+             max_val="0.16"
+             name="WaterBlurMult"
+             top="124"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         follows="all"
+         height="180"
+         label="Image"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         help_topic="water_waves_tab"
+         name="Waves"
+         top="0"
+         width="698">
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="BHText"
+             top="10"
+             width="200">
+                Big Wave Direction
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="WaterWave1DirXText"
+             top_pad="4"
+             width="10">
+                X
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WaterWave1DirYText"
+             top_delta="18"
+             width="10">
+                Y
+            </text>
+            <slider
+             control_name="WaterWave1DirX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left="24"
+             max_val="4"
+             min_val="-4"
+             name="WaterWave1DirX"
+             top="55"
+             width="200" />
+            <slider
+             control_name="WaterWave1DirY"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             max_val="4"
+             min_val="-4"
+             name="WaterWave1DirY"
+             top_pad="5"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-14"
+             name="BHText2"
+             top_delta="3"
+             width="355">
+                Little Wave Direction
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="WaterWave2DirXText"
+             top="90"
+             width="10">
+                X
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="0"
+             name="WaterWave2DirYText"
+             top_delta="20"
+             width="10">
+                Y
+            </text>
+            <slider
+             control_name="WaterWave2DirX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left="24"
+             max_val="4"
+             min_val="-4"
+             name="WaterWave2DirX"
+             top="115"
+             width="200" />
+            <slider
+             control_name="WaterWave2DirY"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             max_val="4"
+             min_val="-4"
+             name="WaterWave2DirY"
+             top_pad="10"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left="240"
+             name="BHText3"
+             top="4"
+             width="200">
+                Normal Map
+            </text>
+            <texture_picker
+             height="143"
+             layout="topleft"
+             left="250"
+             name="WaterNormalMap"
+             top="22"
+             width="128" />
+        </panel>
+    </tab_container>
+</floater>