diff options
author | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
---|---|---|
committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
commit | 9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch) | |
tree | bd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/newview/skins/default/xui/en/menu_viewer.xml | |
parent | cd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff) | |
parent | 65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff) |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 66d7625ab9..4c4867b862 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -299,8 +299,7 @@ function="Floater.Visible" parameter="moveview" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="moveview" /> + function="World.Toggle.MovementControls" /> </menu_item_check> <menu_item_check label="View Controls" @@ -310,8 +309,7 @@ function="Floater.Visible" parameter="camera" /> <menu_item_check.on_click - function="Floater.Toggle" - parameter="camera" /> + function="World.Toggle.CameraControls" /> </menu_item_check> <menu_item_check label="Ban Lines" @@ -356,6 +354,24 @@ function="ToggleControl" parameter="ShowParcelOwners" /> </menu_item_check> + <menu_item_check + label="Coordinates" + name="Coordinates"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowCoordinates" /> + <menu_item_check.on_check + control="NavBarShowCoordinates" /> + </menu_item_check> + <menu_item_check + label="Parcel Properties" + name="Parcel Properties"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowParcelProperties" /> + <menu_item_check.on_check + control="NavBarShowParcelProperties" /> + </menu_item_check> </menu> <menu_item_separator layout="topleft" /> |