diff options
author | McCabe Maxsted | 2009-09-21 23:01:33 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-21 23:01:33 -0700 |
commit | a361a615d410ed27d67d33a46a79a6264bf95f67 (patch) | |
tree | d1659fb5d668d821d668048205a4f9740023772d /linden/indra/newview/skins/default/xui/en-us | |
parent | Fixed unhandled exception in llinventorymodel.cpp (diff) | |
download | meta-impy-a361a615d410ed27d67d33a46a79a6264bf95f67.zip meta-impy-a361a615d410ed27d67d33a46a79a6264bf95f67.tar.gz meta-impy-a361a615d410ed27d67d33a46a79a6264bf95f67.tar.bz2 meta-impy-a361a615d410ed27d67d33a46a79a6264bf95f67.tar.xz |
Changed 'Presets' button to 'Sky'
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
4 files changed, 15 insertions, 15 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml index 21a7664..8ad4fff 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml | |||
@@ -45,9 +45,9 @@ | |||
45 | use_bounding_rect="true" width="395" /> | 45 | use_bounding_rect="true" width="395" /> |
46 | </layout_stack> | 46 | </layout_stack> |
47 | </layout_panel> | 47 | </layout_panel> |
48 | <layout_panel auto_resize="false" bottom="0" left="0" min_width="202" mouse_opaque="false" | 48 | <layout_panel auto_resize="false" bottom="0" left="0" min_width="184" mouse_opaque="false" |
49 | name="windlight_remote_container" use_bounding_rect="true" user_resize="false" | 49 | name="windlight_remote_container" use_bounding_rect="true" user_resize="false" |
50 | width="200"> | 50 | width="186"> |
51 | <panel background_visible="false" border="false" bottom="0" name="windlight_remote" /> | 51 | <panel background_visible="false" border="false" bottom="0" name="windlight_remote" /> |
52 | </layout_panel> | 52 | </layout_panel> |
53 | <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false" | 53 | <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml index e282c3c..b9c6fc3 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml | |||
@@ -1,14 +1,14 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="1" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="1" |
3 | enabled="true" follows="right|bottom" height="20" left="0" | 3 | enabled="true" follows="right|bottom" height="20" left="0" |
4 | name="windlight_controls" width="200"> | 4 | name="windlight_controls" width="182"> |
5 | <button bottom="-21" follows="left|bottom" font="SansSerif" halign="center" height="20" | 5 | <button bottom="-21" follows="left|bottom" font="SansSerif" halign="center" height="20" |
6 | label="Editor" left="4" name="Environment" | 6 | label="Editor" left="4" name="Environment" |
7 | tool_tip="Click here to adjust world environment" width="80" /> | 7 | tool_tip="Click here to adjust world environment" width="80" /> |
8 | <flyout_button bottom="-21" follows="left|bottom" height="20" label="Presets" left_delta="82" width="86" | 8 | <flyout_button bottom="-21" follows="left|bottom" height="20" label="Sky" left_delta="82" width="71" |
9 | list_position="above" mouse_opaque="true" name="Presets" tool_tip="Windlight presets"> | 9 | list_position="above" mouse_opaque="true" name="Presets" tool_tip="Windlight presets"> |
10 | </flyout_button> | 10 | </flyout_button> |
11 | <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true" | 11 | <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true" |
12 | label="" left_delta="88" name="Popup" scale_image="true" control_name="ShowWindlightSettingsPopup" | 12 | label="" left_delta="72" name="Popup" scale_image="true" control_name="ShowWindlightSettingsPopup" |
13 | tool_tip="Click here to adjust world environment" width="22" /> | 13 | tool_tip="Click here to adjust draw distance" width="22" /> |
14 | </panel> | 14 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml index 89ae7ce..ead9ad7 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml | |||
@@ -1,9 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" |
3 | enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true" | 3 | enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true" |
4 | name="windlight_remote" use_bounding_rect="true" width="200"> | 4 | name="windlight_remote" use_bounding_rect="true" width="182"> |
5 | <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="200" /> | 5 | <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="182" /> |
6 | <panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="200" /> | 6 | <panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="182" /> |
7 | <string name="sunrise"> | 7 | <string name="sunrise"> |
8 | Sunrise | 8 | Sunrise |
9 | </string> | 9 | </string> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml index dd4fbe8..2fd9be5 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml | |||
@@ -1,21 +1,21 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" |
3 | follows="right|bottom" height="47" left="0" mouse_opaque="true" | 3 | follows="right|bottom" height="47" left="0" mouse_opaque="true" |
4 | name="windlight_remote" use_bounding_rect="true" width="200"> | 4 | name="windlight_remote" use_bounding_rect="true" width="182"> |
5 | <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="200" /> | 5 | <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="182" /> |
6 | <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip" | 6 | <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip" |
7 | decimal_digits="0" enabled="true" height="18" | 7 | decimal_digits="0" enabled="true" height="18" |
8 | increment="8" initial_val="160" label="Draw Distance:" | 8 | increment="8" initial_val="160" label="Draw Distance:" |
9 | label_width="80" left="6" max_val="512" min_val="64" mouse_opaque="true" | 9 | label_width="78" left="6" max_val="512" min_val="64" mouse_opaque="true" |
10 | name="DrawDistance" show_text="true" width="188" /> | 10 | name="DrawDistance" show_text="true" width="170" /> |
11 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 11 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
12 | bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top" | 12 | bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top" |
13 | font="SansSerifSmall" h_pad="0" halign="left" height="12" | 13 | font="SansSerifSmall" h_pad="0" halign="left" height="12" |
14 | left="188" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0" | 14 | left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0" |
15 | width="8"> | 15 | width="8"> |
16 | m | 16 | m |
17 | </text> | 17 | </text> |
18 | <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="200" /> | 18 | <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" /> |
19 | <string name="sunrise"> | 19 | <string name="sunrise"> |
20 | Sunrise | 20 | Sunrise |
21 | </string> | 21 | </string> |