Second Life viewer sources 1.18.6.2-RC

1 files changed, 25 insertions, 12 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
index 2c72b40..ec2f4e9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
@@ -11,23 +11,36 @@
              height="16" hidden="false" initial_value="false" label="Run in a window"
              left="160" mouse_opaque="true" name="windowed mode" radio_style="false"
              width="256" />
-        <combo_box allow_text_entry="false" bottom="-47" enabled="false" follows="left|top"
+             
+             <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
+             embedded_items="false" enabled="false" follows="left|top"
+             font="SansSerifSmall" height="20" hidden="false" hide_border="true"
+             hide_scrollbar="true" left="160" max_length="65535"
+             mouse_opaque="true" name="voice_chat_description" width="350" tab_stop="false"
+             word_wrap="true">If unchecked viewer will display full screen when logged in.</text_editor>
+<!--    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-47" drop_shadow_visible="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
+             left="160" mouse_opaque="true" name="full_screen_text" v_pad="0" width="256">
+                Viewer will display full screen when logged in.
+        </text> -->
+        <combo_box allow_text_entry="false" bottom="-67" enabled="false" follows="left|top"
              height="18" hidden="false" left="160" max_chars="20" mouse_opaque="true"
              name="fullscreen combo" width="160" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-87" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="Fullscreen Aspect Ratio:" v_pad="0"
              width="150">
                 Fullscreen Aspect Ratio:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-77" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-102" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="(width / height)" v_pad="0" width="128">
                 (width / height)
         </text>
-        <combo_box allow_text_entry="true" bottom="-66" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="true" bottom="-91" enabled="true" follows="left|top"
              height="16" hidden="false" left="160" max_chars="100" mouse_opaque="true"
              name="aspect_ratio" width="160">
                 <combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
@@ -40,43 +53,43 @@
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box bottom="-85" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
+        <check_box bottom="-110" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Auto detect" left="160" mouse_opaque="true"
              name="aspect_auto_detect" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
                 UI Size:
         </text>
-        <slider bottom="-102" can_edit_text="true" control_name="UIScaleFactor"
+        <slider bottom="-127" can_edit_text="true" control_name="UIScaleFactor"
              decimal_digits="3" enabled="true" height="16" hidden="false"
              increment="0.025" initial_val="1" left="160" max_val="1.4" min_val="0.75"
              mouse_opaque="true" name="UI Scale" show_text="true" value="1" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-138" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-163" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="222" mouse_opaque="true" name="(meters, lower is faster)" v_pad="0"
              width="180">
                 (meters, lower is faster)
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-166" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-191" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
              left="10" mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Display Options:
         </text>
-        <check_box bottom="-123" control_name="UIAutoScale" enabled="true" follows="left|top"
+        <check_box bottom="-148" control_name="UIAutoScale" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" initial_value="false"
              label="Use resolution independent scale" left="160" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-        <spinner bottom="-142" control_name="RenderFarClip" decimal_digits="0" enabled="true"
+        <spinner bottom="-167" control_name="RenderFarClip" decimal_digits="0" enabled="true"
              follows="left|top" height="16" hidden="false" increment="32"
              initial_val="160" label="Draw Distance:" label_width="150" left="10"
              max_val="512" min_val="64" mouse_opaque="true" name="draw_distance"
              width="202" />
-        <check_box bottom="-170" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom="-195" control_name="FirstPersonAvatarVisible" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Show Avatar in Mouselook" left="160"
              mouse_opaque="true" name="avfp" radio_style="false"