diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml index e398fe4f39321572b62d4667f2d69c91d837e261..ceac842cccce130286025dfe5f59a77c01ae41a1 100755 --- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml @@ -7,7 +7,7 @@ help_topic="environment_editor_floater" save_rect="true" title="ENVIRONMENT SETTINGS" - width="365"> + width="367"> <check_box height="15" @@ -96,7 +96,7 @@ top_pad="5" width="360" wrap="true"> - Note: your custom settings will not be visible to other users. + Note: Your custom settings will not be visible to other users. </text> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_quick_settings.xml b/indra/newview/skins/default/xui/en/floater_quick_settings.xml index bc8a5c0615a2cbc9481a8c9b647eaadb7dcc0cb3..34f43be3e52e48059ca044103fa9862b7d3ba433 100644 --- a/indra/newview/skins/default/xui/en/floater_quick_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_quick_settings.xml @@ -7,7 +7,8 @@ min_width="300" name="floater_quick_settings" positioning="cascading" - title="QUICK SETTINGS"> + title="QUICK SETTINGS" + save_rect="true"> <panel name="quick_settings" class="quick_settings" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index bd094b44d45f4827a8b708df919a5ddc4304a91f..29d568a2002d3f055d359dd73a4c9accba84cf12 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -947,23 +947,6 @@ name="EnableSSR" top_pad="5" width="170" /> - <text - type="string" - length="1" - enabled_control="RenderDeferred" - follows="left|top" - font="SansSerifSmall" - halign="left" - height="12" - layout="topleft" - left_pad="5" - mouse_opaque="true" - name="DofOptsText" - width="128" - top_delta="0" - text_color="WarningRed"> - Warning: Very intensive! - </text> </panel> <panel enabled_control="VertexShaderEnable" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_interface.xml b/indra/newview/skins/default/xui/en/panel_preferences_interface.xml index 23616cae539501c72ce074492234827146f9df2c..d773a30d12f2894d26b8c95a802d44aa431a983d 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_interface.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_interface.xml @@ -146,7 +146,7 @@ height="16" label="Display targeted avatars name under the crosshair" left="7" - top_pad="15" + top_pad="5" name="AlchemyMouselookIFF" width="275" control_name="AlchemyMouselookIFF"/> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index e30f599ad0a7a876599a37b98eab38f3a328726d..a71c00b719ca755e99fa1fc674f6d12aa01f0873 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -387,7 +387,7 @@ left="25" name="voice_chat_settings" width="200" - top_pad="7"> + top_pad="5"> Voice Chat Settings </text> <text diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index 46cbc1e87fdf91c127c8cf898191a5b0a3e0bd1a..2aa08fec7acd8f5cdd601f168f9296d8f16f902d 100755 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -49,7 +49,7 @@ height="16" layout="topleft" left_pad="-240" - top_delta="5" + top_delta="2" name="Input" width="60"> Input @@ -96,7 +96,7 @@ layout="topleft" left_delta="-300" name="My volume label" - top_pad="14" + top_pad="8" width="200"> My volume: </text> @@ -111,7 +111,7 @@ max_val="2" name="mic_volume_slider" tool_tip="Change the volume using this slider" - top_pad="-18" + top_pad="-15" width="110" /> <text type="string"