diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 18:23:01 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-15 18:23:01 -0700 |
| commit | 217b1b1b6bf401cfb35c7725793bbbaa2264cfa2 (patch) | |
| tree | 2688c04e5fcf4c91ed8b6fdb3ae7bb05ebb43f1c /indra/newview/skins/default/xui | |
| parent | f1beac1a70e74bef5caf4850bd9146a583e00739 (diff) | |
| parent | 90378004089e35f54301ee9b348a39d87e7b6f40 (diff) | |
Merge from branch-test (EXT-651)
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 78 |
1 files changed, 38 insertions, 40 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b0839ce255..52a0877b6e 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1065,34 +1065,46 @@ 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.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" + label="Upload Image (L$[COST])..." + layout="topleft" + name="Upload Image" + shortcut="control|U"> + <menu_item_call.on_click + function="File.UploadImage" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Close Window" layout="topleft" - name="Release Keys"> + name="Close Window" + shortcut="control|W"> <menu_item_call.on_click - function="Tools.ReleaseKeys" - parameter="" /> + function="File.CloseWindow" /> <menu_item_call.on_enable - function="Tools.EnableReleaseKeys" - parameter="" /> + function="File.EnableCloseWindow" /> </menu_item_call> <menu_item_call - label="Set UI Size to Default" + label="Close All Windows" layout="topleft" - name="Set UI Size to Default"> + name="Close All Windows" + shortcut="control|shift|W"> <menu_item_call.on_click - function="View.DefaultUISize" /> + function="File.CloseAllWindows" /> + <menu_item_call.on_enable + function="File.EnableCloseAllWindows" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> + <menu_item_separator/> <menu_item_check label="Always Run" layout="topleft" @@ -1116,28 +1128,6 @@ <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" @@ -1305,6 +1295,14 @@ <menu_item_call.on_click function="Advanced.RebakeTextures" /> </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/> <menu_item_check label="Limit Select Distance" layout="topleft" |