diff options
| author | Jacek Antonelli | 2009-09-03 01:40:48 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-03 01:40:48 -0500 |
| commit | d6a1eca66144e88fdd59ad230f1610e75f548cd7 (patch) | |
| tree | da8bde4e457d47303c0c29babf2aaec4f836a1d7 /linden/indra/newview/skins/default/xui/en-us | |
| parent | Updated some python scripts to not use deprecated modules. (diff) | |
| download | meta-impy-d6a1eca66144e88fdd59ad230f1610e75f548cd7.zip meta-impy-d6a1eca66144e88fdd59ad230f1610e75f548cd7.tar.gz meta-impy-d6a1eca66144e88fdd59ad230f1610e75f548cd7.tar.bz2 meta-impy-d6a1eca66144e88fdd59ad230f1610e75f548cd7.tar.xz | |
Applied object import/export patch.
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | 6 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 8 |
2 files changed, 13 insertions, 1 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 8d059c1..ac3d359 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 | |||
| @@ -54,7 +54,11 @@ | |||
| 54 | <on_click function="Object.ReportAbuse" /> | 54 | <on_click function="Object.ReportAbuse" /> |
| 55 | <on_enable function="Object.EnableReportAbuse" /> | 55 | <on_enable function="Object.EnableReportAbuse" /> |
| 56 | </menu_item_call> | 56 | </menu_item_call> |
| 57 | <menu_item_separator /> | 57 | <menu_item_call label="Backup" enabled="false" hidden="false" |
| 58 | mouse_opaqu="true" name="Export"> | ||
| 59 | <on_click function="Object.Export" /> | ||
| 60 | <on_enable function="Object.EnableExport" /> | ||
| 61 | </menu_item_call> | ||
| 58 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> | 62 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> |
| 59 | <on_click function="Object.Inspect" /> | 63 | <on_click function="Object.Inspect" /> |
| 60 | <on_enable function="Object.EnableInspect" /> | 64 | <on_enable function="Object.EnableInspect" /> |
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 f837029..c5f0331 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,6 +8,14 @@ | |||
| 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> | ||
| 11 | <menu_item_call name="Upload Image" | 19 | <menu_item_call name="Upload Image" |
| 12 | label="Upload Image (L$[COST])..." | 20 | label="Upload Image (L$[COST])..." |
| 13 | shortcut="control|U"> | 21 | shortcut="control|U"> |