diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-11 10:53:49 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-11 10:53:49 -0400 |
commit | d6437f3e29942ba513666b21db3eb9268d96c458 (patch) | |
tree | 753da212a42b8a9df9fd9eb26b2c8ad09386ea85 /indra/newview | |
parent | 61d43d205c70481a66f596e7263411bb20bdb0b9 (diff) | |
parent | 2143a8f722c294533d3e222f918a56cbc43a81fd (diff) |
Automated merge with ssh://hg.lindenlab.com/davep/viewer-experimental/
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index c95e27155a..5a9b5356fd 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -884,6 +884,18 @@ parameter="Upload Animation" /> </menu_item_call> <menu_item_call + label="Model..." + layout="topleft" + name="Upload Model"> + <menu_item_call.on_click + function="File.UploadModel" + parameter="" /> + <menu_item_call.on_enable + function="File.EnableUploadModel" /> + <menu_item_call.on_visible + function="File.MeshEnabled"/> + </menu_item_call> + <menu_item_call label="Bulk (L$[COST] per file)..." layout="topleft" name="Bulk Upload"> |