diff options
| author | McCabe Maxsted | 2009-09-27 21:44:44 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-27 21:44:44 -0700 |
| commit | a8477f3570e249ee8b4a089340001ff9b26f69c0 (patch) | |
| tree | 4c81383dc2b4bb650141147a08151c3f0be9547e /linden/indra/newview/skins | |
| parent | Show disabled buttons for own profile rather than hiding them (diff) | |
| parent | Rearranged the Import stuff in the File menu. (diff) | |
| download | meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.zip meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.gz meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.bz2 meta-impy-a8477f3570e249ee8b4a089340001ff9b26f69c0.tar.xz | |
Merge jacek/next into 1.2.0-next
Diffstat (limited to 'linden/indra/newview/skins')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | 2 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml index 15cdc9e..2c7ca3c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | <on_enable function="Object.EnableReturn" /> | 44 | <on_enable function="Object.EnableReturn" /> |
| 45 | </menu_item_call> | 45 | </menu_item_call> |
| 46 | <pie_menu label="More >" name="Rate Menu"> | 46 | <pie_menu label="More >" name="Rate Menu"> |
| 47 | <menu_item_call label="Backup" enabled="false" hidden="false" | 47 | <menu_item_call label="Export" enabled="false" hidden="false" |
| 48 | mouse_opaqu="true" name="Export"> | 48 | mouse_opaqu="true" name="Export"> |
| 49 | <on_click function="Object.Export" /> | 49 | <on_click function="Object.Export" /> |
| 50 | <on_enable function="Object.EnableExport" /> | 50 | <on_enable function="Object.EnableExport" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 92b7008..9da0ec5 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | |||
| @@ -8,14 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | <menu name="File" create_jump_keys="true" label="File" | 9 | <menu name="File" create_jump_keys="true" label="File" |
| 10 | opaque="true" tear_off="true"> | 10 | opaque="true" tear_off="true"> |
| 11 | <menu_item_call enabled="false" hidden="false" label="Import" mouse_opaque="true" name="Import"> | ||
| 12 | <on_click function="Object.Import" /> | ||
| 13 | <on_enable function="Object.EnableImport" /> | ||
| 14 | </menu_item_call> | ||
| 15 | <menu_item_call enabled="false" hidden="false" label="Upload + Import" mouse_opaque="true" name="Import"> | ||
| 16 | <on_click function="Object.ImportUpload" /> | ||
| 17 | <on_enable function="Object.EnableImport" /> | ||
| 18 | </menu_item_call> | ||
| 19 | <menu_item_call name="Upload Image" | 11 | <menu_item_call name="Upload Image" |
| 20 | label="Upload Image (L$[COST])..." | 12 | label="Upload Image (L$[COST])..." |
| 21 | shortcut="control|U"> | 13 | shortcut="control|U"> |
| @@ -37,6 +29,16 @@ | |||
| 37 | <on_click function="File.UploadBulk" userdata="" /> | 29 | <on_click function="File.UploadBulk" userdata="" /> |
| 38 | </menu_item_call> | 30 | </menu_item_call> |
| 39 | <menu_item_separator /> | 31 | <menu_item_separator /> |
| 32 | <menu_item_call name="Import" label="Import" enabled="false"> | ||
| 33 | <on_click function="Object.Import" /> | ||
| 34 | <on_enable function="Object.EnableImport" /> | ||
| 35 | </menu_item_call> | ||
| 36 | <menu_item_call name="Upload + Import" label="Upload + Import" | ||
| 37 | enabled="false"> | ||
| 38 | <on_click function="Object.ImportUpload" /> | ||
| 39 | <on_enable function="Object.EnableImport" /> | ||
| 40 | </menu_item_call> | ||
| 41 | <menu_item_separator /> | ||
| 40 | <menu_item_call name="Close Window" | 42 | <menu_item_call name="Close Window" |
| 41 | label="Close Window" | 43 | label="Close Window" |
| 42 | shortcut="control|W"> | 44 | shortcut="control|W"> |