merge

1 files changed, 264 insertions, 62 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 80be16322a..83405a8e0a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3,14 +3,14 @@
 <map>
     <key>installables</key>
     <map>
-      <key>GL</key>
+      <key>GLOD</key>
       <map>
         <key>license</key>
-        <string>GL</string>
+        <string>GLOD</string>
         <key>license_file</key>
-        <string>LICENSES/GL.txt</string>
+        <string>LICENSES/glod.txt</string>
         <key>name</key>
-        <string>GL</string>
+        <string>GLOD</string>
         <key>platforms</key>
         <map>
           <key>darwin</key>
@@ -18,9 +18,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0b7c1d43dc2b39301fef6c05948fb826</string>
+              <string>7c546f54f6ed654f713c778af3925dd4</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20101004.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226566/arch/Darwin/installer/glod-1.0pre4-darwin-20110413.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -30,9 +30,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d85d88088360aee5b67105ad93b5ad16</string>
+              <string>18c708163d2a669bc3c030b05b4ebe61</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20100929.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226657/arch/Linux/installer/glod-1.0pre4-linux-20110414.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -42,9 +42,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f8d98cbe78d5aafbc7aaabf840325aaf</string>
+              <string>c4ae6cddc04e0b2908a301726a53922c</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-0.0.0-windows-20110303.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-glod/rev/226194/arch/CYGWIN/installer/glod-1.0pre4-windows-20110408.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -219,6 +219,54 @@
           </map>
         </map>
       </map>
+      <key>colladadom</key>
+      <map>
+        <key>license</key>
+        <string>scea</string>
+        <key>license_file</key>
+        <string>LICENSES/collada.txt</string>
+        <key>name</key>
+        <string>colladadom</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>2222b901f310c1806847293789d69ac7</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/Darwin/installer/colladadom-2.2-darwin-20110413.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin</string>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>d05be8fc196e9ce7b6636b931cf13dff</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226716/arch/Linux/installer/colladadom-2.2-linux-20110415.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>a9f548eb6f9aaf292508a8b09c7f2f73</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/CYGWIN/installer/colladadom-2.2-windows-20110413.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+        </map>
+      </map>
       <key>curl</key>
       <map>
         <key>license</key>
@@ -531,6 +579,42 @@
           </map>
         </map>
       </map>
+      <key>glext</key>
+      <map>
+        <key>license</key>
+        <string>glext</string>
+        <key>license_file</key>
+        <string>LICENSES/glext.txt</string>
+        <key>name</key>
+        <string>glext</string>
+        <key>platforms</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>5de58ca0fe19abf68b25956762ee0d29</string>
+              <key>url</key>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>5de58ca0fe19abf68b25956762ee0d29</string>
+              <key>url</key>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+        </map>
+      </map>
       <key>glh_linear</key>
       <map>
         <key>license</key>
@@ -615,42 +699,6 @@
           </map>
         </map>
       </map>
-      <key>google-perftools</key>
-      <map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/google-perftools.txt</string>
-        <key>name</key>
-        <string>google-perftools</string>
-        <key>platforms</key>
-        <map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>cf513fc2eec4a414cc804cf408932a45</string>
-              <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>8108bffe1c814be9d035b47dac3d4541</string>
-              <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google-perftools-1.0-windows-20101001b.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
-        </map>
-      </map>
       <key>google_breakpad</key>
       <map>
         <key>license</key>
@@ -704,7 +752,7 @@
         <key>license</key>
         <string>bsd</string>
         <key>license_file</key>
-        <string>LICENSES/gmock.txt</string>
+        <string>LICENSES/googlemock.txt</string>
         <key>name</key>
         <string>googlemock</string>
         <key>platforms</key>
@@ -776,7 +824,7 @@
         <key>license</key>
         <string>lgpl</string>
         <key>license_file</key>
-        <string>LICENSES/gtk.txt</string>
+        <string>LICENSES/gtk-atk-pango-glib.txt</string>
         <key>name</key>
         <string>gtk-atk-pango-glib</string>
         <key>platforms</key>
@@ -990,9 +1038,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>735a955e6442733e2342ab12c1087488</string>
+              <string>f194ba857ca8dd86483a3ef24535d0db</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.5.1-windows-20110221.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/226532/arch/CYGWIN/installer/libpng-1.5.1-windows-20110413.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1047,6 +1095,54 @@
           </map>
         </map>
       </map>
+      <key>llconvexdecomposition</key>
+      <map>
+        <key>license</key>
+        <string>havok</string>
+        <key>license_file</key>
+        <string>on_file</string>
+        <key>name</key>
+        <string>llconvexdecomposition</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>bfa0e1ce006302f6d90b712b20e2d96e</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110415.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin</string>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>d6207290496f4b464996924b6319932e</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110415.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>9f8579663eeac8ed5cfc6390560f0e24</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/226714/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110415.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+        </map>
+      </map>
       <key>llqtwebkit</key>
       <map>
         <key>license</key>
@@ -1351,6 +1447,42 @@
           </map>
         </map>
       </map>
+      <key>pcre</key>
+      <map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/pcre-license.txt</string>
+        <key>name</key>
+        <string>pcre</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>cb04654cdfe93e3c8d16fef0c475e2bb</string>
+              <key>url</key>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/226370/arch/Darwin/installer/pcre-7.6-darwin-20110411.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin</string>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>18854c815c6f960e22add25cf1ff93d4</string>
+              <key>url</key>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-pcre/rev/226572/arch/Linux/installer/pcre-7.6-linux-20110413.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+        </map>
+      </map>
       <key>pth</key>
       <map>
         <key>license</key>
@@ -1447,6 +1579,42 @@
           </map>
         </map>
       </map>
+      <key>tcmalloc</key>
+      <map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/google-perftools.txt</string>
+        <key>name</key>
+        <string>tcmalloc</string>
+        <key>platforms</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>dde928cb24d22a267004a8c17669ba65</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226426/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>8308f7bd68bb7083655753b7abe7225f</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+        </map>
+      </map>
       <key>tut</key>
       <map>
         <key>license</key>
@@ -1680,28 +1848,49 @@
               <key>name</key>
               <string>Release</string>
             </map>
-            <key>ReleaseOS</key>
+            <key>VC10msbuildRelWithDebInfo</key>
             <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
                 <array>
-                  <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
+                  <string>-DUNATTENDED:BOOL=OFF</string>
                   <string>-DWORD_SIZE:STRING=32</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES</string>
                 </array>
+              </map>
+              <key>name</key>
+              <string>VC10msbuildRelWithDebInfo</string>
+            </map>
+            <key>VC10msbuildRelease</key>
+            <map>
+              <key>configure</key>
+              <map>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
                 </array>
+                <key>command</key>
+                <string>cmake</string>
+                <key>options</key>
+                <array>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DLL_RELEASE_FOR_DOWNLOAD:BOOL=YES</string>
               </map>
               <key>name</key>
-              <string>ReleaseOS</string>
+              <string>VC10msbuildRelease</string>
             </map>
+            <key>VCexpressRelWithDebInfo</key>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
+              <string>VCexpressRelWithDebInfo</string>
           </map>
           <key>name</key>
           <string>common</string>
@@ -2253,25 +2442,38 @@
               <key>name</key>
               <string>Release</string>
             </map>
-            <key>ReleaseOS</key>
+            <key>VC10msbuildRelWithDebInfo</key>
             <map>
               <key>build</key>
               <map>
-                <key>arguments</key>
-                <array>
+                <string>msbuild.exe</string>
                   <string>SecondLife.sln</string>
+                  <string>/verbosity:minimal</string>
+                  <string>/t:build</string>
+                  <string>/p:Configuration=RelWithDebInfo</string>
+                  <string>/p:Platform=Win32</string>
+                  <string>/p:"VCBuildAdditionalOptions= /useenv"</string>
+                  <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
                 </array>
+              <string>VC10msbuildRelWithDebInfo</string>
+            <key>VC10msbuildRelease</key>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
                 <array>
                   <string>/p:Configuration=Release</string>
-                  <string>/p:Platform=Win32</string>
-                  <string>/t:Build</string>
+                </array>
+              <string>VC10msbuildRelease</string>
+            <key>VCexpressRelWithDebInfo</key>
+                <key>arguments</key>
+                <array>
+                  <string>"RelWithDebInfo|Win32"</string>
+                </array>
+                <string>vcbuild.exe</string>
+                  <string>/u</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/toolsversion:4.0</string>
-                  <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2288,7 +2490,7 @@
                 </array>
               </map>
               <key>name</key>
-              <string>ReleaseOS</string>
+              <string>VCexpressRelWithDebInfo</string>
             </map>
           </map>
           <key>name</key>