From bd37b14e9217935b9d70faf04c835c9d4aeda9c7 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Tue, 17 May 2011 17:25:38 -0400
Subject: BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to
 fail.

copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE
for OS builds. This causes configure to fail as llconvexdecomposition is not
available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so
that llconvexdecompositionstub is used instead. problem only affects windows
builds.
---
 autobuild.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'autobuild.xml')

diff --git a/autobuild.xml b/autobuild.xml
index 0e4db1bdca..94c2fe1b9d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2317,7 +2317,6 @@
                   <string>-G</string>
                   <string>"Visual Studio 10"</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
-- 
cgit v1.2.3


From 9075e1104fd8238991f42b90e51b77d3497db02a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 17 May 2011 19:26:18 -0400
Subject: fix merge error in open source configurations to disable proprietary
 components

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'autobuild.xml')

diff --git a/autobuild.xml b/autobuild.xml
index 94c2fe1b9d..d908344df9 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2393,7 +2393,7 @@
                   <string>-G</string>
                   <string>"Visual Studio 10"</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
@@ -2469,7 +2469,7 @@
                   <string>-G</string>
                   <string>"Visual Studio 10"</string>
                   <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
-- 
cgit v1.2.3