diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
13 files changed, 107 insertions, 81 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index d5d4565ca1..ab81a86720 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -204,7 +204,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="region_name_text" top_delta="0" use_ellipses="true" @@ -237,7 +237,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="region_type_text" top_delta="0" width="175"> @@ -262,7 +262,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="estate_name_text" top_delta="0" width="175"> @@ -276,8 +276,8 @@ supports [AMOUNT2] objects layout="topleft" left="440" name="estate_owner_label" - right="550" - width="100" + right="565" + width="120" word_wrap="true"> Estate Owner: </text> @@ -287,7 +287,7 @@ supports [AMOUNT2] objects follows="left|top" height="20" layout="topleft" - left_delta="110" + left_delta="125" name="estate_owner_text" top_delta="0" width="175"> diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml index a7ab5abf38..1539c6448e 100644 --- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml @@ -2,22 +2,31 @@ <floater legacy_header_height="18" height="130" - help_topic="environment_editor_floater" + help_topic="" layout="topleft" - name="Environment Editor Floater" + name="Delete Env Preset" save_rect="true" - title="DELETE PRESETS" + title="DELETE ENV PRESET" width="550"> + + <string name="title_water">Delete Water Preset</string> + <string name="title_sky">Delete Sky Preset</string> + <string name="title_day_cycle">Delete Day Cycle</string> + + <string name="label_water">Preset:</string> + <string name="label_sky">Preset:</string> + <string name="label_day_cycle">Day cycle:</string> + <text follows="top|left|right" font="SansSerif" height="10" layout="topleft" left="50" - name="delete_preset" + name="label" top="60" width="60"> - Setting: + Preset: </text> <combo_box follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index e76059751e..7572efea05 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -3,17 +3,23 @@ legacy_header_height="18" height="450" layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" + name="Edit Day cycle" + help_topic="" save_rect="true" title="Edit Day Cycle" width="800"> + + <string name="title_new">Create a New Day Cycle</string> + <string name="title_edit">Edit Day Cycle</string> + <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> + <text follows="top|left|right" height="10" layout="topleft" left="30" - name="info_string" + name="hint" top="25" width="700"> To edit your preset, adjust the controls then click "Save" @@ -24,7 +30,7 @@ height="10" layout="topleft" left="30" - name="info_string" + name="label" top_pad="25" width="120"> Preset Name: @@ -34,7 +40,7 @@ follows="top|left" layout="topleft" left_pad="10" - name="water_preset_combo" + name="day_cycle_combo" top_delta="-5" width="200"> <combo_box.item @@ -47,7 +53,7 @@ height="40" layout="topleft" left_pad="10" - name="info_string" + name="note" top_delta="0" width="405" wrap="true"> @@ -452,7 +458,7 @@ <check_box follows="top|left" height="10" - label="Make this preset my new water setting" + label="Make this my new day cycle" layout="topleft" left="330" name="new_water_preset_chb" diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml index 7ddb7ac1e1..ae7e83ee56 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -3,17 +3,23 @@ legacy_header_height="18" height="375" layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" + name="Edit Sky Preset" + help_topic="" save_rect="true" title="Edit Sky Preset" width="900"> + + <string name="title_new">Create a New Sky Preset</string> + <string name="title_edit">Edit Sky Preset</string> + <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string> + <text follows="top|left|right" height="10" layout="topleft" left="30" - name="info_string" + name="hint" top="25" width="700"> To edit your preset, adjust the controls then click "Save" @@ -24,7 +30,7 @@ height="10" layout="topleft" left="30" - name="info_string" + name="label" top_pad="25" width="120"> Preset Name: @@ -34,7 +40,7 @@ follows="top|left" layout="topleft" left_pad="10" - name="water_preset_combo" + name="sky_preset_combo" top_delta="-5" width="200"> <combo_box.item @@ -47,7 +53,7 @@ height="40" layout="topleft" left_pad="10" - name="info_string" + name="note" top_delta="0" width="405" wrap="true"> diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml index a29c725ee9..cf4e224835 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml @@ -3,18 +3,23 @@ legacy_header_height="18" height="450" layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" + name="Edit Water Preset" + help_topic="" save_rect="true" title="Edit Water Preset" width="900"> - + + <string name="title_new">Create a New Water Preset</string> + <string name="title_edit">Edit a Water Preset</string> + <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string> + <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string> + <text follows="top|left|right" height="10" layout="topleft" left="30" - name="info_string" + name="hint" top="25" width="700"> To edit your preset, adjust the controls then click "Save" @@ -26,7 +31,7 @@ height="10" layout="topleft" left="30" - name="info_string" + name="label" top_pad="25" width="120"> Preset Name: @@ -51,7 +56,7 @@ height="40" layout="topleft" left_pad="10" - name="info_string" + name="note" top_delta="0" width="405" wrap="true"> diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 619669d28a..38b305db7e 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -41,14 +41,14 @@ follows="top|left" left="16" name="info_parcel_label" - width="48"> + width="70"> Parcel: </text> <text top_delta="0" follows="top|left" height="16" - left="56" + left="78" name="info_parcel" right="-20"> PARCEL NAME @@ -57,14 +57,14 @@ follows="top|left" left="16" name="info_size_label" - width="48"> + width="70"> Size: </text> <text follows="top|left" top_delta="0" height="32" - left="56" + left="78" name="info_size" right="-20"> [AREA] m² @@ -164,14 +164,14 @@ left_delta="0" name="sell_to_agent" top_pad="4" - width="170" /> + width="150" /> <button height="20" label="Select" left_pad="5" name="sell_to_select_agent" top_delta="0" - width="60" /> + width="90" /> <text follows="top|left" font="SansSerif" @@ -199,20 +199,20 @@ <radio_item bottom="40" height="0" - left="10" + left="2" name="none" visible="false" /> <radio_item top_pad="10" - height="16" + height="18" label="No, keep ownership of objects" - left="10" + left="2" name="no" /> <radio_item top_pad="10" height="16" label="Yes, sell objects with land" - left="10" + left="2" name="yes" /> </radio_group> <button @@ -221,7 +221,7 @@ name="show_objects" left="70" top_pad="10" - width="110" /> + width="140" /> <text bottom_delta="30" follows="top|left" @@ -229,7 +229,7 @@ height="16" left="16" name="nag_message_label" - right="-20"> + right="-5"> REMEMBER: All sales are final. </text> <button @@ -239,15 +239,15 @@ left_delta="0" name="sell_btn" top_pad="10" - width="130" /> + width="185" /> <button follows="bottom|left" height="20" label="Cancel" - left_pad="30" + left_pad="5" name="cancel_btn" top_delta="0" - width="90" /> + width="85" /> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index e413228ddc..ec190ab656 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -100,7 +100,7 @@ right="-5" name="upload_btn" top_delta="0" - width="100" /> + width="110" /> <flyout_button follows="left|top" height="23" @@ -147,7 +147,7 @@ right="-5" left_pad="5" name="discard_btn" - width="100" /> + width="110" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index b06c6dc215..4dfdcd15c7 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -105,7 +105,7 @@ left_delta="0" name="id_text" top_pad="10" - width="100"> + width="107"> Object ID: </text> <line_editor @@ -116,7 +116,7 @@ left_pad="3" name="id_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" @@ -138,7 +138,7 @@ left="10" top_pad="5" name="obj_name_text" - width="100"> + width="107"> Object name: </text> <line_editor @@ -148,7 +148,7 @@ left_pad="3" name="object_name_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" @@ -170,7 +170,7 @@ left="10" top_pad="5" name="owner_name_text" - width="100"> + width="107"> Owner: </text> <line_editor @@ -180,7 +180,7 @@ left_pad="3" name="owner_name_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 093a5e36d3..d8aec81eba 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -539,22 +539,22 @@ label="New preset..." name="new_water_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="new_water"/> </menu_item_call> <menu_item_call label="Edit preset..." name="edit_water_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="edit_water"/> </menu_item_call> <menu_item_call label="Delete preset..." name="delete_water_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="delete_water"/> </menu_item_call> </menu> @@ -565,22 +565,22 @@ label="New preset..." name="new_sky_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="new_sky"/> </menu_item_call> <menu_item_call label="Edit preset..." name="edit_sky_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="edit_sky"/> </menu_item_call> <menu_item_call label="Delete preset..." name="delete_sky_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="delete_sky"/> </menu_item_call> </menu> @@ -591,22 +591,22 @@ label="New preset..." name="new_day_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="new_day_cycle"/> </menu_item_call> <menu_item_call label="Edit preset..." name="edit_day_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="edit_day_cycle"/> </menu_item_call> <menu_item_call label="Delete preset..." name="delete_day_preset"> <menu_item_call.on_click - function="stub" - parameter="stub"/> + function="World.EnvPreset" + parameter="delete_day_cycle"/> </menu_item_call> </menu> </menu> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 600b0e3b71..607e1bb213 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -84,7 +84,7 @@ Maximum 200 per group daily name="create_new_notice" tool_tip="Create a new notice" top_delta="0" - width="93" /> + width="127" /> <button follows="top|left" height="23" @@ -128,7 +128,7 @@ Maximum 200 per group daily layout="topleft" name="lbl3" top_pad="10" - width="60"> + width="62"> Subject: </text> <line_editor @@ -141,7 +141,7 @@ Maximum 200 per group daily max_length_bytes="63" name="create_subject" prevalidate_callback="ascii" - width="220" /> + width="218" /> <text follows="left|top" type="string" @@ -151,7 +151,7 @@ Maximum 200 per group daily left="10" name="lbl4" top_pad="5" - width="60"> + width="62"> Message: </text> <text_editor @@ -162,7 +162,7 @@ Maximum 200 per group daily max_length="511" name="create_message" top_delta="0" - width="220" + width="218" word_wrap="true" /> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index 38e8b9844f..cdf14572fe 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -196,7 +196,7 @@ initial_val="256" label="" label_width="0" - left_delta="40" + left_delta="68" max_val="2048" min_val="0" mouse_opaque="true" 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 cefd1a5516..f7666bdc4c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -723,7 +723,7 @@ follows="left|top" height="12" layout="topleft" - left="388" + left="407" left_pad="-30" name="TerrainDetailText" top="250" @@ -735,7 +735,7 @@ draw_border="false" height="38" layout="topleft" - left_delta="10" + left_delta="5" name="TerrainDetailRadio" top_pad="5" width="70"> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index 956ba53a26..91d0bbe6bf 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -123,10 +123,10 @@ <button follows="left|top" height="23" - label="Save" + label="Apply" layout="topleft" right="-160" - name="save_btn" + name="apply_btn" top_pad="150" width="100" /> <button |