Adding fixed water edit dialog.

2 files changed, 513 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
new file mode 100644
index 0000000000..03bbc05dad
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+        can_minimize="false"
+        can_tear_off="false"
+        can_resize="true"
+        can_drag_on_left="false"
+        can_close="true"
+        can_dock="true"
+        bevel_style="in"
+        height="500"
+        layout="topleft"
+        name="Fixed Environment"
+        save_rect="true"
+        title="Fixed Environment"
+        save_dock_state="true"
+        save_visibility="true"
+        single_instance="true" 
+        width="650">
+    <layout_stack name="floater_stack"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="vertical">
+        <layout_panel name="info_panel"
+                auto_resize="false"
+                user_resize="false"
+                bg_alpha_color="blue"
+                min_height="60">
+            <text
+                    follows="left|top"
+                    top_delta="30"
+                    left_delta="10"
+                    width="35"
+                    height="20"
+                    font="SansSerif">
+            Name:
+            </text>
+            <line_editor
+                    follows="left|top"
+                    top_delta="-2"
+                    left_delta="45"
+                    width="250"
+                    name="settings_name"
+                    max_length_chars="32"
+                    height="20"/>
+            <button
+                    height="23"
+                    label="Load"
+                    follows="left|top"
+                    left_delta="260"
+                    font="SansSerif"
+                    top_delta="-2"
+                    name="btn_load"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+            <button
+                    height="23"
+                    label="Import"
+                    follows="right|top"
+                    right="-10"
+                    font="SansSerif"
+                    top_delta="0"
+                    name="btn_import"
+                    tool_tip="Import legacy settings from disk." 
+                    width="96" />
+        </layout_panel>
+        <layout_panel name="tab_area"
+                auto_resize="true"
+                user_resize="true"
+                height="11"
+                min_height="0"
+                visible="true">
+            <tab_container
+                    follows="all"
+                    halign="left"
+                    layout="topleft"
+                    left="0"
+                    name="tab_settings"
+                    tab_position="top"
+                    tab_width="120"
+                    tab_padding_right="3">
+                <!-- move to own file -->
+            </tab_container>
+        </layout_panel>
+        <layout_panel name="button_panel"
+                follows="left|top|right|bottom"
+                auto_resize="false"
+                user_resize="false"
+                height="40"
+                visible="true">
+            <button
+                    height="23"
+                    label="Save"
+                    follows="left|top"
+                    font="SansSerif"
+                    name="btn_commit"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+            <button
+                    height="23"
+                    label="Cancel"
+                    follows="right|top"
+                    right="-10"
+                    top_delta="0"
+                    font="SansSerif"
+                    name="btn_cancel"
+                    tool_tip="Load a settings from inventory" 
+                    width="96" />
+
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
new file mode 100644
index 0000000000..fe088d98cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+        border="true"
+        follows="all"
+        label="Water"
+        layout="topleft"
+        left="0"
+        help_topic="land_general_tab"
+        name="panel_settings_water"
+        top="0">
+    <layout_stack name="water_stack1"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            follows="left|top|right|bottom"
+            orientation="vertical">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="105">
+            <text
+                    follows="left|top"
+                    height="20"
+                    font="SansSerif"
+                    layout="topleft"
+                    left="5"
+                    top="5"
+                    width="215">
+                Water Fog:
+            </text>
+            <text
+                    follows="left|top"
+                    height="10"
+                    layout="left|top"
+                    left_delta="15"
+                    top_delta="0"
+                    width="60">
+                Color:
+            </text>
+            <color_swatch
+                    can_apply_immediately="true"
+                    follows="left|top"
+                    height="37"
+                    label_height="0"
+                    layout="topleft"
+                    left_delta="0"
+                    name="water_fog_color"
+                    top_pad="5"
+                    width="60" />
+            <text
+                    follows="left|top"
+                    height="10"
+                    top_delta="-15"
+                    left_delta="80"
+                    width="200">
+                Density Exponent:
+            </text>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top|right"
+                    height="10"
+                    initial_value="0"
+                    layout="top"
+                    left_delta="15"
+                    max_val="10"
+                    name="water_fog_density"
+                    top_delta="5"
+                    width="200"/>
+            <text
+                    follows="left|top"
+                    height="10"
+                    top_delta="25"
+                    left_delta="-15"
+                    width="200">
+                Underwater Modifier:</text>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top|right"
+                    height="10"
+                    initial_value="0"
+                    layout="top"
+                    left_delta="15"
+                    max_val="10"
+                    name="water_underwater_mod"
+                    top_delta="20"
+                    width="200"/>
+        </layout_panel>
+        <layout_panel
+                auto_resize="true"
+                user_resize="true"
+                visible="true">
+            <layout_stack name="water_stack2"
+                    left="5"
+                    top="5"
+                    right="-5"
+                    bottom="-5"
+                    follows="left|top|right|bottom"
+                    orientation="horizontal">
+                <layout_panel
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        visible="true"
+                        min_width="375"
+                        width="50">
+                    <text
+                            follows="left|top"
+                            height="20"
+                            font="SansSerif"
+                            layout="topleft"
+                            left="5"
+                            top="5"
+                            width="215">
+                        Waves:
+                    </text>
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left="15"
+                            top_delta="20"
+                            width="215">
+                        Normal Map
+                    </text>
+                    <texture_picker
+                            height="100"
+                            layout="topleft"
+                            left_delta="0"
+                            name="water_normal_map"
+                            top_pad="5"
+                            width="100"/>
+
+                    <text
+                            follows="left|top"
+                            height="16"
+                            layout="topleft"
+                            top_delta="-20"
+                            left_delta="120">
+                        Large Wave Speed
+                    </text>
+                    <panel
+                            follows="left|top"
+                            border="true"
+                            bg_alpha_color="red"
+                            background_visible="true"
+                            width="100"
+                            height="100"
+                            left_delta="0"
+                            top_delta="21">
+                        <text>
+                            placeholder
+                        </text>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="X:"
+                                left_delta="10"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave1_x"
+                                top_pad="5"
+                                width="100"/>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="Y:"
+                                left_delta="0"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave1_y"
+                                top_pad="5"
+                                orientation="vertical" 
+                                height="70"/>
+                    </panel>
+                    <text
+                            follows="left|top"
+                            height="16"
+                            layout="topleft"
+                            top_delta="-20"
+                            left_delta="120">
+                        Small Wave Speed
+                    </text>
+                    <panel
+                            follows="left|top"
+                            border="true"
+                            bg_alpha_color="red"
+                            background_visible="true"
+                            width="100"
+                            height="100"
+                            left_delta="0"
+                            top_delta="21"
+                            >
+                        <text>
+                            placeholder
+                        </text>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="X:"
+                                left_delta="10"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave2_x"
+                                top_pad="5"
+                                width="100"/>
+                        <slider
+                                decimal_digits="1"
+                                follows="left|top"
+                                initial_value="0"
+                                layout="topleft"
+                                label="Y:"
+                                left_delta="0"
+                                max_val="4"
+                                min_val="-4"
+                                name="water_wave2_y"
+                                top_pad="5"
+                                orientation="vertical" 
+                                height="70"/>
+                    </panel>
+
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left="15"
+                            top_pad="10"
+                            width="215">
+                        Reflection Wavelet Scale
+                    </text>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            initial_value="0.7"
+                            layout="topleft"
+                            label="X:"
+                            left_delta="10"
+                            max_val="10"
+                            name="water_normal_scale_x"
+                            top_pad="5"
+                            width="150"/>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            initial_value="0.7"
+                            layout="topleft"
+                            max_val="10"
+                            name="water_normal_scale_y"
+                            top_pad="6"
+                            label="Y:"
+                            width="150"/>
+                    <slider
+                            decimal_digits="1"
+                            follows="left|top"
+                            initial_value="0.7"
+                            layout="topleft"
+                            max_val="10"
+                            name="water_normal_scale_z"
+                            top_pad="6"
+                            label="Z:"
+                            width="150"/>
+
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left_delta="175"
+                            top_delta="-52"
+                            width="150">
+                        Fresnel Scale:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            increment="0.01"
+                            initial_value="0.7"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_fresnel_scale"
+                            top_pad="5"
+                            width="150"/>
+                    <text
+                            follows="left|top|right"
+                            layout="topleft"
+                            left_delta="-5"
+                            name="FresnelOffsetText"
+                            top_pad="10"
+                            width="150">
+                        Fresnel Offset:
+                    </text>
+                    <slider
+                            decimal_digits="2"
+                            follows="left|top|right"
+                            increment="0.01"
+                            initial_value="0.7"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_fresnel_offset"
+                            top_pad="5"
+                            width="150"/>
+                </layout_panel>
+                <layout_panel
+                        border="true"
+                        bevel_style="in"
+                        auto_resize="true"
+                        user_resize="true"
+                        width="50"
+                        visible="true">
+                    <text
+                            follows="left|top"
+                            height="20"
+                            font="SansSerif"
+                            layout="topleft"
+                            left="5"
+                            top="5"
+                            width="215">
+                        Refraction And Blur:
+                    </text>
+                    <text
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            top_delta="25"
+                            left_delta="5"
+                            width="215">
+                        Refraction Scale (Above)
+                    </text>
+                    <slider
+                            control_name="water_scale_above"
+                            decimal_digits="2"
+                            follows="left|top"
+                            increment="0.01"
+                            initial_value="0.1"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_scale_above"
+                            top_pad="5"
+                            width="200" />
+                    <text
+                            type="string"
+                            length="1"
+                            follows="left|top|right"
+                            height="16"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_pad="15"
+                            width="215">
+                        Refraction Scale (Below)
+                    </text>
+                    <slider
+                            control_name="water_scale_below"
+                            decimal_digits="2"
+                            follows="left|top"
+                            height="10"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            name="water_scale_below"
+                            top_pad="5"
+                            width="200"/>
+                    <text
+                            follows="left|top|right"
+                            font="SansSerif"
+                            height="16"
+                            layout="topleft"
+                            left_delta="-5"
+                            top_pad="5"
+                            width="215">
+                        Blur Multiplier
+                    </text>
+                    <slider
+                            control_name="water_blur_multip"
+                            follows="left|top"
+                            height="10"
+                            increment="0.001"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="0.16"
+                            name="water_blur_multip"
+                            top_pad="5"
+                            width="200"/>
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
+</panel>