diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
| commit | 85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch) | |
| tree | dbb248900527cac25c307970fb5c817b90b715e7 /indra/newview/skins/default/xui/en/panel_main_inventory.xml | |
| parent | ee159d8e742a7281f304fc45b692c111706d294e (diff) | |
| parent | 9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff) | |
Merge of viewer 2 changes
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_main_inventory.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 26 |
1 files changed, 23 insertions, 3 deletions
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 37d59de66f..94a54f08e4 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -16,7 +16,7 @@ <filter_editor text_pad_left="14" follows="left|top|right" - font="SanSerif" + font="SanSerif" height="20" label="Filter" layout="topleft" @@ -61,7 +61,7 @@ height="30" layout="bottomleft" left="0" - visible="true" + visible="true" name="bottom_panel" width="330"> <button @@ -112,7 +112,7 @@ mouse_opaque="false" name="Inventory Menu" top="15" - visible="true" + visible="true" width="290"> <menu height="101" @@ -170,6 +170,26 @@ function="File.EnableUpload" /> </menu_item_call> <menu_item_call + label="Model (L$[COST])..." + layout="topleft" + name="Upload Model"> + <menu_item_call.on_click + function="File.UploadModel" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call + label="Scene..." + layout="topleft" + name="Upload Scene"> + <menu_item_call.on_click + function="File.UploadScene" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUpload" /> + </menu_item_call> + <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft" name="Bulk Upload"> |