diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-26 23:06:41 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-26 23:06:41 +0300 |
| commit | ebfbf2a561a98e5af4dde319edb49a663e27de26 (patch) | |
| tree | ad532b6d84ed227d4595d511591a61dad1b15ed0 /indra/newview/skins/default/xui | |
| parent | 4f8098344e45aac1c177ba258e866c32d5287565 (diff) | |
STORM-1285 WIP Connected "Delete Water / Sky / Day Cycle" floaters (not functional) to the main menu.
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_delete_env_preset.xml | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 36 |
2 files changed, 32 insertions, 23 deletions
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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 38bffd04ed..d5d41b981f 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> |