From 2143a8f722c294533d3e222f918a56cbc43a81fd Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 11 Aug 2010 10:53:43 -0400
Subject: 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.
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 ++++++++++++
 install.xml                                        |  4 ++--
 2 files changed, 14 insertions(+), 2 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
@@ -883,6 +883,18 @@
                  function="Upload.CalculateCosts"
                  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"
diff --git a/install.xml b/install.xml
index 4f8e7bff26..ae3c4178a6 100644
--- a/install.xml
+++ b/install.xml
@@ -1058,9 +1058,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>33dee1d84d006a5339cf6ba4096b8bd9</string>
+            <string>54c95551cc9f792a889e2c54d3af7767</string>
             <key>url</key>
-            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.1-linux-20100721.tar.bz2</uri>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.1-linux-20100810.tar.bz2</uri>
           </map>
           <key>darwin</key>
           <map>
-- 
cgit v1.2.3