aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml18
2 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index e6f69e8..30efcc4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-09-27 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-09-27 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * Rearranged the Import stuff in the File menu.
4
5 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
6
7
3 * Changed "Backup" to "Export" in object pie menu. 8 * Changed "Backup" to "Export" in object pie menu.
4 9
5 modified: linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml 10 modified: linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
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">