diff options
| author | Jacek Antonelli | 2009-11-18 22:56:09 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-18 22:56:09 -0600 |
| commit | 07354173bfa3d536d4f493cec7dfe06a68fc95cc (patch) | |
| tree | a9e24f1be9bd43fc80b15efa61a4b7d7b0e145f4 /linden/indra | |
| parent | Renamed menu items: "Import Object..." and "Import + Upload..." (diff) | |
| download | meta-impy-07354173bfa3d536d4f493cec7dfe06a68fc95cc.zip meta-impy-07354173bfa3d536d4f493cec7dfe06a68fc95cc.tar.gz meta-impy-07354173bfa3d536d4f493cec7dfe06a68fc95cc.tar.bz2 meta-impy-07354173bfa3d536d4f493cec7dfe06a68fc95cc.tar.xz | |
Added "(L$[COST] per texture)" to "Import + Upload..."
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 1 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index ecf6fcb..895f488 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
| @@ -676,6 +676,7 @@ void init_menus() | |||
| 676 | gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost); | 676 | gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost); |
| 677 | gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost); | 677 | gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost); |
| 678 | gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost); | 678 | gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost); |
| 679 | gMenuHolder->childSetLabelArg("ImportUpload", "[COST]", upload_cost); | ||
| 679 | 680 | ||
| 680 | gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE); | 681 | gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE); |
| 681 | gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE); | 682 | gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE); |
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 b53cbf3..7d36195 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 | |||
| @@ -34,7 +34,7 @@ | |||
| 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="ImportUpload" | 36 | <menu_item_call name="ImportUpload" |
| 37 | label="Import + Upload..." | 37 | label="Import + Upload... (L$[COST] per texture)" |
| 38 | enabled="false"> | 38 | enabled="false"> |
| 39 | <on_click function="Object.ImportUpload" /> | 39 | <on_click function="Object.ImportUpload" /> |
| 40 | <on_enable function="Object.EnableImport" /> | 40 | <on_enable function="Object.EnableImport" /> |