diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-28 16:41:06 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-28 16:41:06 -0600 |
| commit | 746037362ed07af0c799caf22cf9e425744359a0 (patch) | |
| tree | 2e4c83fee5334da2071103fa4706ac4abb218490 /indra/newview/skins/default | |
| parent | 26a0c18e95d8d542016d89cc78b948438bc335cb (diff) | |
| parent | b414b5067e3e47da7d9baf490d94534b4c65a8eb (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 15 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml index 0d974075f5..05a4e60de7 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml @@ -43,14 +43,14 @@ function="File.EnableUpload" /> </menu_item_call> <menu_item_call - label="Model (L$[COST])..." + label="Model..." layout="topleft" name="Upload Model"> <menu_item_call.on_click function="File.UploadModel" parameter="" /> <menu_item_call.on_enable - function="File.EnableUpload" /> + function="File.EnableUploadModel" /> </menu_item_call> <menu_item_call label="Scene..." diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 158e764eae..5c75a95c16 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2061,6 +2061,17 @@ function="ToggleControl" parameter="DebugShowTime" /> </menu_item_check> + <menu_item_check + label="Show Upload Cost" + layout="topleft" + name="Show Upload Cost"> + <menu_item_check.on_check + function="CheckControl" + parameter="DebugShowUploadCost" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="DebugShowUploadCost" /> + </menu_item_check> <menu_item_check label="Show Render Info" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 5cd5d0dfea..afd098ba21 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -80,14 +80,14 @@ function="File.EnableUpload" /> </menu_item_call> <menu_item_call - label="Model (L$[COST])..." + label="Model..." layout="topleft" name="Upload Model"> <menu_item_call.on_click function="File.UploadModel" parameter="" /> <menu_item_call.on_enable - function="File.EnableUpload" /> + function="File.EnableUploadModel" /> </menu_item_call> <menu_item_call label="Scene..." |