diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 543 |
1 files changed, 273 insertions, 270 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 5979bfab4f..ebdfb01787 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -56,7 +56,7 @@ function="Edit.EnableCustomizeAvatar" /> </menu_item_call> <menu_item_check - label="My Things" + label="My Inventory" layout="topleft" name="Inventory" shortcut="control|I"> @@ -114,25 +114,22 @@ layout="topleft" name="Communicate" tear_off="true"> - <menu_item_check + <menu_item_call label="My Friends" layout="topleft" name="My Friends" shortcut="control|shift|F"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="contacts.friends" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="contacts.friends" /> - </menu_item_check> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> <menu_item_call label="My Groups" layout="topleft" name="My Groups"> <menu_item_call.on_click - function="Floater.Show" - parameter="contacts.groups" /> + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> </menu_item_call> <menu_item_separator layout="topleft" /> @@ -155,17 +152,26 @@ function="Floater.Toggle" parameter="nearby_chat" /> </menu_item_check> - <menu_item_check - label="Nearby Speakers" + <menu_item_call + label="Nearby People" layout="topleft" name="Active Speakers" shortcut="control|shift|A"> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="nearby_panel" /> + </menu_item_call> + <menu_item_check + label="Nearby Media" + layout="topleft" + name="Nearby Media" + shortcut="control|alt|N"> <menu_item_check.on_check function="Floater.Visible" - parameter="active_speakers" /> + parameter="nearby_media" /> <menu_item_check.on_click function="Floater.Toggle" - parameter="active_speakers" /> + parameter="nearby_media" /> </menu_item_check> <!--menu_item_check label="Block List" @@ -232,7 +238,7 @@ <menu_item_separator layout="topleft" /> <menu_item_call - label="Place Profile" + label="About Land" layout="topleft" name="About Land"> <menu_item_call.on_click @@ -1620,6 +1626,234 @@ </menu_item_check> <menu_item_separator layout="topleft" /> + <menu + label="Shortcuts" + layout="topleft" + name="Shortcuts" + tear_off="true" + visible="false"> + <menu_item_check + label="Search" + layout="topleft" + name="Search" + shortcut="control|F"> + <menu_item_check.on_check + function="Floater.Visible" + parameter="search" /> + <menu_item_check.on_click + function="Floater.Toggle" + parameter="search" /> + </menu_item_check> + <menu_item_call + enabled="false" + label="Release Keys" + layout="topleft" + name="Release Keys"> + <menu_item_call.on_click + function="Tools.ReleaseKeys" + parameter="" /> + <menu_item_call.on_enable + function="Tools.EnableReleaseKeys" + parameter="" /> + </menu_item_call> + <menu_item_call + label="Set UI Size to Default" + layout="topleft" + name="Set UI Size to Default"> + <menu_item_call.on_click + function="View.DefaultUISize" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_check + label="Always Run" + layout="topleft" + name="Always Run" + shortcut="control|R"> + <menu_item_check.on_check + function="World.CheckAlwaysRun" /> + <menu_item_check.on_click + function="World.AlwaysRun" /> + </menu_item_check> + <menu_item_check + label="Fly" + layout="topleft" + name="Fly" + shortcut="Home"> + <menu_item_check.on_click + function="Agent.toggleFlying" /> + <menu_item_check.on_enable + function="Agent.enableFlying" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Close Window" + layout="topleft" + name="Close Window" + shortcut="control|W"> + <menu_item_call.on_click + function="File.CloseWindow" /> + <menu_item_call.on_enable + function="File.EnableCloseWindow" /> + </menu_item_call> + <menu_item_call + label="Close All Windows" + layout="topleft" + name="Close All Windows" + shortcut="control|shift|W"> + <menu_item_call.on_click + function="File.CloseAllWindows" /> + <menu_item_call.on_enable + function="File.EnableCloseAllWindows" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Snapshot to Disk" + layout="topleft" + name="Snapshot to Disk" + shortcut="control|`" + use_mac_ctrl="true"> + <menu_item_call.on_click + function="File.TakeSnapshotToDisk" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Mouselook" + layout="topleft" + name="Mouselook" + shortcut="M"> + <menu_item_call.on_click + function="View.Mouselook" /> + <menu_item_call.on_enable + function="View.EnableMouselook" /> + </menu_item_call> + <menu_item_check + label="Joystick Flycam" + layout="topleft" + name="Joystick Flycam" + shortcut="alt|shift|F"> + <menu_item_check.on_check + function="View.CheckJoystickFlycam" /> + <menu_item_check.on_click + function="View.JoystickFlycam" /> + <menu_item_check.on_enable + function="View.EnableJoystickFlycam" /> + </menu_item_check> + <menu_item_call + label="Reset View" + layout="topleft" + name="Reset View" + shortcut="Esc"> + <menu_item_call.on_click + function="View.ResetView" /> + </menu_item_call> + <menu_item_call + label="Look at Last Chatter" + layout="topleft" + name="Look at Last Chatter" + shortcut="control|\"> + <menu_item_call.on_click + function="View.LookAtLastChatter" /> + <menu_item_call.on_enable + function="View.EnableLastChatter" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu + create_jump_keys="true" + label="Select Build Tool" + layout="topleft" + name="Select Tool" + tear_off="true"> + <menu_item_call + label="Focus Tool" + layout="topleft" + name="Focus" + shortcut="control|1"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="focus" /> + </menu_item_call> + <menu_item_call + label="Move Tool" + layout="topleft" + name="Move" + shortcut="control|2"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="move" /> + </menu_item_call> + <menu_item_call + label="Edit Tool" + layout="topleft" + name="Edit" + shortcut="control|3"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="edit" /> + </menu_item_call> + <menu_item_call + label="Create Tool" + layout="topleft" + name="Create" + shortcut="control|4"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="create" /> + </menu_item_call> + <menu_item_call + label="Land Tool" + layout="topleft" + name="Land" + shortcut="control|5"> + <menu_item_call.on_click + function="Tools.SelectTool" + parameter="land" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Zoom In" + layout="topleft" + name="Zoom In" + shortcut="control|0"> + <menu_item_call.on_click + function="View.ZoomIn" /> + </menu_item_call> + <menu_item_call + label="Zoom Default" + layout="topleft" + name="Zoom Default" + shortcut="control|9"> + <menu_item_call.on_click + function="View.ZoomDefault" /> + </menu_item_call> + <menu_item_call + label="Zoom Out" + layout="topleft" + name="Zoom Out" + shortcut="control|8"> + <menu_item_call.on_click + function="View.ZoomOut" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Toggle Fullscreen" + layout="topleft" + name="Toggle Fullscreen" + > + <!-- Note: shortcut="alt|Enter" was deleted from the preceding node--> + <menu_item_call.on_click + function="View.Fullscreen" /> + </menu_item_call> + </menu> + <menu_item_separator + layout="topleft" /> <menu_item_call label="Show Debug Settings" layout="topleft" @@ -2416,232 +2650,6 @@ parameter="stop record" /> </menu_item_call> </menu> - <menu - label="Shortcuts" - layout="topleft" - name="Shortcuts" - tear_off="true" - visible="false"> - <menu_item_check - label="Search" - layout="topleft" - name="Search" - shortcut="control|F"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="search" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="search" /> - </menu_item_check> - <menu_item_call - enabled="false" - label="Release Keys" - layout="topleft" - name="Release Keys"> - <menu_item_call.on_click - function="Tools.ReleaseKeys" - parameter="" /> - <menu_item_call.on_enable - function="Tools.EnableReleaseKeys" - parameter="" /> - </menu_item_call> - <menu_item_call - label="Set UI Size to Default" - layout="topleft" - name="Set UI Size to Default"> - <menu_item_call.on_click - function="View.DefaultUISize" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_check - label="Always Run" - layout="topleft" - name="Always Run" - shortcut="control|R"> - <menu_item_check.on_check - function="World.CheckAlwaysRun" /> - <menu_item_check.on_click - function="World.AlwaysRun" /> - </menu_item_check> - <menu_item_check - label="Fly" - layout="topleft" - name="Fly" - shortcut="Home"> - <menu_item_check.on_click - function="Agent.toggleFlying" /> - <menu_item_check.on_enable - function="Agent.enableFlying" /> - </menu_item_check> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Close Window" - layout="topleft" - name="Close Window" - shortcut="control|W"> - <menu_item_call.on_click - function="File.CloseWindow" /> - <menu_item_call.on_enable - function="File.EnableCloseWindow" /> - </menu_item_call> - <menu_item_call - label="Close All Windows" - layout="topleft" - name="Close All Windows" - shortcut="control|shift|W"> - <menu_item_call.on_click - function="File.CloseAllWindows" /> - <menu_item_call.on_enable - function="File.EnableCloseAllWindows" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Snapshot to Disk" - layout="topleft" - name="Snapshot to Disk" - shortcut="control|`" - use_mac_ctrl="true"> - <menu_item_call.on_click - function="File.TakeSnapshotToDisk" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Mouselook" - layout="topleft" - name="Mouselook" - shortcut="M"> - <menu_item_call.on_click - function="View.Mouselook" /> - <menu_item_call.on_enable - function="View.EnableMouselook" /> - </menu_item_call> - <menu_item_check - label="Joystick Flycam" - layout="topleft" - name="Joystick Flycam" - shortcut="alt|shift|F"> - <menu_item_check.on_check - function="View.CheckJoystickFlycam" /> - <menu_item_check.on_click - function="View.JoystickFlycam" /> - <menu_item_check.on_enable - function="View.EnableJoystickFlycam" /> - </menu_item_check> - <menu_item_call - label="Reset View" - layout="topleft" - name="Reset View" - shortcut="Esc"> - <menu_item_call.on_click - function="View.ResetView" /> - </menu_item_call> - <menu_item_call - label="Look at Last Chatter" - layout="topleft" - name="Look at Last Chatter" - shortcut="control|\"> - <menu_item_call.on_click - function="View.LookAtLastChatter" /> - <menu_item_call.on_enable - function="View.EnableLastChatter" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu - create_jump_keys="true" - label="Select Build Tool" - layout="topleft" - name="Select Tool" - tear_off="true"> - <menu_item_call - label="Focus Tool" - layout="topleft" - name="Focus" - shortcut="control|1"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="focus" /> - </menu_item_call> - <menu_item_call - label="Move Tool" - layout="topleft" - name="Move" - shortcut="control|2"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="move" /> - </menu_item_call> - <menu_item_call - label="Edit Tool" - layout="topleft" - name="Edit" - shortcut="control|3"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="edit" /> - </menu_item_call> - <menu_item_call - label="Create Tool" - layout="topleft" - name="Create" - shortcut="control|4"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="create" /> - </menu_item_call> - <menu_item_call - label="Land Tool" - layout="topleft" - name="Land" - shortcut="control|5"> - <menu_item_call.on_click - function="Tools.SelectTool" - parameter="land" /> - </menu_item_call> - </menu> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Zoom In" - layout="topleft" - name="Zoom In" - shortcut="control|0"> - <menu_item_call.on_click - function="View.ZoomIn" /> - </menu_item_call> - <menu_item_call - label="Zoom Default" - layout="topleft" - name="Zoom Default" - shortcut="control|9"> - <menu_item_call.on_click - function="View.ZoomDefault" /> - </menu_item_call> - <menu_item_call - label="Zoom Out" - layout="topleft" - name="Zoom Out" - shortcut="control|8"> - <menu_item_call.on_click - function="View.ZoomOut" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Toggle Fullscreen" - layout="topleft" - name="Toggle Fullscreen" - > - <!-- Note: shortcut="alt|Enter" was deleted from the preceding node--> - <menu_item_call.on_click - function="View.Fullscreen" /> - </menu_item_call> - </menu> <menu create_jump_keys="true" @@ -2933,7 +2941,8 @@ function="Advanced.GrabBakedTexture" parameter="iris" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="iris" /> </menu_item_call> <menu_item_call label="Head" @@ -2943,7 +2952,8 @@ function="Advanced.GrabBakedTexture" parameter="head" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="head" /> </menu_item_call> <menu_item_call label="Upper Body" @@ -2953,7 +2963,8 @@ function="Advanced.GrabBakedTexture" parameter="upper" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="upper" /> </menu_item_call> <menu_item_call label="Lower Body" @@ -2963,7 +2974,8 @@ function="Advanced.GrabBakedTexture" parameter="lower" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="lower" /> </menu_item_call> <menu_item_call label="Skirt" @@ -2973,17 +2985,8 @@ function="Advanced.GrabBakedTexture" parameter="skirt" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> - </menu_item_call> - <menu_item_call - label="Skirt" - layout="topleft" - name="Hair"> - <menu_item_call.on_click - function="Advanced.GrabBakedTexture" - parameter="hair" /> - <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="skirt" /> </menu_item_call> </menu> <menu @@ -3006,7 +3009,7 @@ <menu_item_call.on_click function="Advanced.ToggleCharacterGeometry" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Test Male" @@ -3259,7 +3262,7 @@ <menu_item_call.on_click function="Admin.ForceTakeCopy" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Force Owner To Me" @@ -3268,7 +3271,7 @@ <menu_item_call.on_click function="Admin.HandleObjectOwnerSelf" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Force Owner Permissive" @@ -3277,7 +3280,7 @@ <menu_item_call.on_click function="Admin.HandleObjectOwnerPermissive" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Delete" @@ -3287,7 +3290,7 @@ <menu_item_call.on_click function="Admin.HandleForceDelete" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Lock" @@ -3297,7 +3300,7 @@ <menu_item_call.on_click function="Admin.HandleObjectLock" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Get Assets IDs" @@ -3307,7 +3310,7 @@ <menu_item_call.on_click function="Admin.HandleObjectAssetIDs" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu @@ -3323,7 +3326,7 @@ <menu_item_call.on_click function="Admin.HandleForceParcelOwnerToMe" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Set to Linden Content" @@ -3333,7 +3336,7 @@ <menu_item_call.on_click function="Admin.HandleForceParcelToContent" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Claim Public Land" @@ -3342,7 +3345,7 @@ <menu_item_call.on_click function="Admin.HandleClaimPublicLand" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu @@ -3358,7 +3361,7 @@ <menu_item_call.on_click function="Admin.HandleRegionDumpTempAssetData" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> <menu_item_call label="Save Region State" @@ -3367,7 +3370,7 @@ <menu_item_call.on_click function="Admin.OnSaveState" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu_item_call @@ -3378,7 +3381,7 @@ function="Floater.Show" parameter="god_tools" /> <menu_item_call.on_enable - function="EnableGodCustomerService" /> + function="IsGodCustomerService" /> </menu_item_call> </menu> <menu |