aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-11-18 22:43:47 -0600
committerJacek Antonelli2009-11-18 22:43:47 -0600
commitb3610dd836340a31bd1f5e033047f1d6ee9aa056 (patch)
treed6c7af578e68b61ed60c846b3c4234a24471bb3b
parentFixed a compile blocker in LLVoSky::stepCurrent(). (diff)
downloadmeta-impy-b3610dd836340a31bd1f5e033047f1d6ee9aa056.zip
meta-impy-b3610dd836340a31bd1f5e033047f1d6ee9aa056.tar.gz
meta-impy-b3610dd836340a31bd1f5e033047f1d6ee9aa056.tar.bz2
meta-impy-b3610dd836340a31bd1f5e033047f1d6ee9aa056.tar.xz
Renamed menu items: "Import Object..." and "Import + Upload..."
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index ce7eb67..c375dab 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * Renamed menu items: "Import Object..." and "Import + Upload..."
4
5 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
6
7
3 * Fixed a compile blocker in LLVoSky::stepCurrent(). 8 * Fixed a compile blocker in LLVoSky::stepCurrent().
4 9
5 modified: linden/indra/newview/llvosky.h 10 modified: linden/indra/newview/llvosky.h
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..b53cbf3 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,11 +29,12 @@
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..."
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" />