diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-23 12:49:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-23 12:49:02 -0500 |
| commit | d7d779f8aa841b5550d4049dd65c097a3c267f3d (patch) | |
| tree | fa2e38f1eb82428c8e77a4aa2c3e1dcdf6295763 /indra/newview/skins | |
| parent | 039417fc7dace6ba4b1f13de93f76b9749b26d41 (diff) | |
| parent | 3212b741663e3cb8608bb432623968c568e626b5 (diff) | |
merge changes for vmrg-190
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_world_map.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 4314c8a9e2..56d79f62c7 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -468,7 +468,7 @@ left="3" top_pad="7" mouse_opaque="true" - name="region_icon" + name="location_icon" width="16" /> <search_editor follows="top|right" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 263d961be1..575e3673c6 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -533,6 +533,14 @@ function="World.EnvSettings" parameter="midnight" /> </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Use Region Settings" + name="Use Region Settings"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="region" /> + </menu_item_call> </menu> |