SL-10297: merge up to master at 6.4.3

1 files changed, 161 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..dbf91b0834
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+        can_tear_off="false"
+        can_resize="false"
+        can_drag_on_left="false"
+        can_close="true"
+        can_dock="false"
+        bevel_style="in"
+        height="550"
+        layout="topleft"
+        name="Fixed Environment"
+        save_rect="true"
+        title="Fixed Environment"
+        save_visibility="false"
+        help_topic="fixed_environment"
+        single_instance="true" 
+        width="750">
+    <string name="edit_sky">Edit Sky:</string>
+    <string name="edit_water">Edit Water:</string>
+    <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"
+                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"
+                    prevalidate_callback="ascii"
+                    max_length_chars="63"
+                    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="false"
+                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">
+                <!-- Tabs inserted here in code -->
+            </tab_container>
+        </layout_panel>
+        <layout_panel name="button_panel"
+                follows="left|top|right|bottom"
+                auto_resize="false"
+                user_resize="false"
+                height="40"
+                visible="true">
+            <layout_stack
+                    follows="bottom|left|right"
+                    height="23"
+                    layout="topleft"
+                    mouse_opaque="false"
+                    name="button_bar_ls"
+                    left="0"
+                    orientation="horizontal"
+                    top="0"
+                    width="313">
+                <layout_panel
+                        follows="bottom|left|right"
+                        height="23"
+                        layout="bottomleft"
+                        left="0"
+                        mouse_opaque="false"
+                        name="save_btn_lp"
+                        auto_resize="true"
+                        width="156">
+                    <button
+                            follows="bottom|left|right"
+                            height="23"
+                            label="Save"
+                            left="1"
+                            layout="topleft"
+                            name="btn_commit"
+                            top="0"
+                            width="155" />
+                    <button
+                            follows="bottom|right"
+                            height="23"
+                            name="btn_flyout"
+                            label=""
+                            layout="topleft"
+                            left_pad="-20"
+                            tab_stop="false"
+                            top="0"
+                            image_selected="SegmentedBtn_Right_Selected_Press"
+                            image_unselected="SegmentedBtn_Right_Off"
+                            image_pressed="SegmentedBtn_Right_Press"
+                            image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                            image_overlay="Arrow_Small_Up"
+                            width="20"/>
+                </layout_panel>
+                <layout_panel
+                        follows="bottom|left|right"
+                        height="23"
+                        layout="bottomleft"
+                        left_pad="3"
+                        mouse_opaque="false"
+                        name="revert_btn_lp"
+                        auto_resize="true"
+                        width="147">
+                    <button
+                            follows="bottom|right"
+                            height="23"
+                            right="-1"
+                            label="Cancel"
+                            layout="topleft"
+                            name="btn_cancel"
+                            top="0"
+                            tool_tip="Revert to last saved version"
+                            width="147" />
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
+</floater>