diff options
| author | McCabe Maxsted | 2009-11-18 23:03:38 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-18 23:03:38 -0700 |
| commit | 1fde9651c1266edcfd9513bfd758986ebca0f6b2 (patch) | |
| tree | 55454b21ae759bc9d8fbe7cb2d802cffa48fadff /linden/indra/newview/skins | |
| parent | Removed old unused reference to gProductName in windows updater (diff) | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| download | meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.zip meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.gz meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.bz2 meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.xz | |
Merge commit 'jacek/next' into next
Diffstat (limited to 'linden/indra/newview/skins')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 10 |
1 files changed, 8 insertions, 2 deletions
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 1b36bca..078fb56 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 | |||
| @@ -29,15 +29,21 @@ | |||
| 29 | <on_click function="File.UploadBulk" userdata="" /> | 29 | <on_click function="File.UploadBulk" userdata="" /> |
| 30 | </menu_item_call> | 30 | </menu_item_call> |
| 31 | <menu_item_separator /> | 31 | <menu_item_separator /> |
| 32 | <menu_item_call name="Import" label="Import" enabled="false"> | 32 | <menu_item_call name="Import" label="Import Object..." enabled="false"> |
| 33 | <on_click function="Object.Import" /> | 33 | <on_click function="Object.Import" /> |
| 34 | <on_enable function="Object.EnableImport" /> | 34 | <on_enable function="Object.EnableImport" /> |
| 35 | </menu_item_call> | 35 | </menu_item_call> |
| 36 | <menu_item_call name="Upload + Import" label="Upload + Import" | 36 | <menu_item_call name="ImportUpload" |
| 37 | label="Import + Upload... (L$[COST] per texture)" | ||
| 37 | enabled="false"> | 38 | enabled="false"> |
| 38 | <on_click function="Object.ImportUpload" /> | 39 | <on_click function="Object.ImportUpload" /> |
| 39 | <on_enable function="Object.EnableImport" /> | 40 | <on_enable function="Object.EnableImport" /> |
| 40 | </menu_item_call> | 41 | </menu_item_call> |
| 42 | <menu_item_call name="Export" label="Export Selected Objects..." | ||
| 43 | enabled="false"> | ||
| 44 | <on_click function="Object.Export" /> | ||
| 45 | <on_enable function="Object.EnableExport" /> | ||
| 46 | </menu_item_call> | ||
| 41 | <menu_item_separator /> | 47 | <menu_item_separator /> |
| 42 | <menu_item_call name="Close Window" | 48 | <menu_item_call name="Close Window" |
| 43 | label="Close Window" | 49 | label="Close Window" |