diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-11 10:53:43 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-11 10:53:43 -0400 |
| commit | 2143a8f722c294533d3e222f918a56cbc43a81fd (patch) | |
| tree | 2049eca9f0986f44b51d0b826b2cb7738422f5f0 /indra/newview/skins | |
| parent | 531a732f43818a2ec8c18f8136c4748ab5f291f9 (diff) | |
CTS-201 FIX update mesh viewer to build and run on linux
Added a lot of checking to deal with the fact that the code may encounter a
stub convexDecomposition library. Additionally updated the linux stub to fix the
automated build so our beta testers can finally have a linux build.
Unrelated fix: added upload mesh to the top level upload menu.
Code reviewed by Vir.
Diffstat (limited to 'indra/newview/skins')
| -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"> |