diff --git a/autobuild.xml b/autobuild.xml
index f4e7189166..fd5bc060fc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1134,9 +1134,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9f8579663eeac8ed5cfc6390560f0e24</string>
+              <string>95a1d483f3d01f480b55801e841b2151</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>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecomposition/rev/227989/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110428.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1784,739 +1784,739 @@
         </map>
       </map>
     </map>
-  <key>package_description</key>
-  <map>
-    <key>name</key>
-    <string>viewer_development</string>
-    <key>platforms</key>
+    <key>package_description</key>
     <map>
-      <key>common</key>
+      <key>name</key>
+      <string>viewer_development</string>
+      <key>platforms</key>
       <map>
-        <key>configurations</key>
+        <key>common</key>
         <map>
-          <key>Debug</key>
+          <key>configurations</key>
           <map>
-            <key>build</key>
+            <key>Debug</key>
             <map>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>command</key>
-              <string>cmake</string>
-              <key>options</key>
-              <array>
-                <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
-                <string>-DWORD_SIZE:STRING=32</string>
-                <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+              <key>build</key>
+              <map>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>cmake</string>
+                <key>options</key>
+                <array>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
+                  <string>-DWORD_SIZE:STRING=32</string>
+                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-              </array>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Debug</string>
             </map>
-            <key>name</key>
-            <string>Debug</string>
-          </map>
-          <key>DebugOS</key>
-          <map>
-            <key>configure</key>
+            <key>DebugOS</key>
             <map>
-              <key>command</key>
-              <string>cmake</string>
-              <key>options</key>
-              <array>
-                <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
-                <string>-DWORD_SIZE:STRING=32</string>
-                <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
-                <string>-DINSTALL_PROPRIETARY=FALSE</string>
-              </array>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
+              <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=Debug</string>
+                  <string>-DWORD_SIZE:STRING=32</string>
+                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>DebugOS</string>
             </map>
-            <key>name</key>
-            <string>DebugOS</string>
-          </map>
-          <key>RelWithDebInfo</key>
-          <map>
-            <key>build</key>
+            <key>RelWithDebInfo</key>
             <map>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>command</key>
-              <string>cmake</string>
-              <key>options</key>
-              <array>
-                <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
-                <string>-DWORD_SIZE:STRING=32</string>
-                <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+              <key>build</key>
+              <map>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>cmake</string>
+                <key>options</key>
+                <array>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
+                  <string>-DWORD_SIZE:STRING=32</string>
+                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-              </array>
+                </array>
+              </map>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
             </map>
-            <key>name</key>
-            <string>RelWithDebInfo</string>
-          </map>
-          <key>RelWithDebInfoOS</key>
-          <map>
-            <key>configure</key>
+            <key>RelWithDebInfoOS</key>
             <map>
-              <key>command</key>
-              <string>cmake</string>
-              <key>options</key>
-              <array>
-                <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
-                <string>-DWORD_SIZE:STRING=32</string>
-                <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
-                <string>-DINSTALL_PROPRIETARY=FALSE</string>
-              </array>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
+              <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=RelWithDebInfo</string>
+                  <string>-DWORD_SIZE:STRING=32</string>
+                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
             </map>
-            <key>name</key>
-            <string>RelWithDebInfoOS</string>
-          </map>
-          <key>Release</key>
-          <map>
-            <key>build</key>
+            <key>Release</key>
             <map>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>command</key>
-              <string>cmake</string>
-              <key>options</key>
-              <array>
-                <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
-                <string>-DWORD_SIZE:STRING=32</string>
-                <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
-                <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
-                <string>-DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE</string>
+              <key>build</key>
+              <map>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>command</key>
+                <string>cmake</string>
+                <key>options</key>
+                <array>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
+                  <string>-DWORD_SIZE:STRING=32</string>
+                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+                  <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+                  <string>-DLL_RELEASE_FOR_DOWNLOAD:BOOL=TRUE</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-              </array>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Release</string>
             </map>
-            <key>name</key>
-            <string>Release</string>
-          </map>
-          <key>ReleaseOS</key>
-          <map>
-            <key>configure</key>
+            <key>ReleaseOS</key>
             <map>
-              <key>command</key>
-              <string>cmake</string>
-              <key>options</key>
-              <array>
-                <string>-DCMAKE_BUILD_TYPE:STRING=Release</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>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
+              <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>-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>ReleaseOS</string>
             </map>
-            <key>name</key>
-            <string>ReleaseOS</string>
           </map>
+          <key>name</key>
+          <string>common</string>
         </map>
-        <key>name</key>
-        <string>common</string>
-      </map>
-      <key>darwin</key>
-      <map>
-        <key>build_directory</key>
-        <string>build-darwin-i386</string>
-        <key>configurations</key>
+        <key>darwin</key>
         <map>
-          <key>Debug</key>
+          <key>build_directory</key>
+          <string>build-darwin-i386</string>
+          <key>configurations</key>
           <map>
-            <key>build</key>
+            <key>Debug</key>
             <map>
-              <key>arguments</key>
-              <array>
-                <string>|</string>
-                <string>grep</string>
-                <string>-v</string>
-                <string>setenv</string>
-              </array>
-              <key>command</key>
-              <string>xcodebuild</string>
-              <key>options</key>
-              <array>
-                <string>-configuration Debug</string>
-                <string>-project SecondLife.xcodeproj</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>|</string>
+                  <string>grep</string>
+                  <string>-v</string>
+                  <string>setenv</string>
+                </array>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration Debug</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Xcode'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Debug</string>
             </map>
-            <key>configure</key>
+            <key>DebugOS</key>
             <map>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Xcode'</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration Debug</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Xcode'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>DebugOS</string>
+            </map>
+            <key>RelWithDebInfo</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>|</string>
+                  <string>grep</string>
+                  <string>-v</string>
+                  <string>setenv</string>
+                </array>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration RelWithDebInfo</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Xcode'</string>
+                </array>
+              </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
+            </map>
+            <key>RelWithDebInfoOS</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration RelWithDebInfo</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Xcode'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>|</string>
+                  <string>grep</string>
+                  <string>-v</string>
+                  <string>setenv</string>
+                </array>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration Release</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Xcode'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>xcodebuild</string>
+                <key>options</key>
+                <array>
+                  <string>-configuration Release</string>
+                  <string>-project SecondLife.xcodeproj</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Xcode'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>ReleaseOS</string>
             </map>
-            <key>name</key>
-            <string>Debug</string>
           </map>
-          <key>DebugOS</key>
+          <key>name</key>
+          <string>darwin</string>
+        </map>
+        <key>linux</key>
+        <map>
+          <key>build_directory</key>
+          <string>build-linux-i686</string>
+          <key>configurations</key>
           <map>
-            <key>build</key>
+            <key>Debug</key>
             <map>
-              <key>command</key>
-              <string>xcodebuild</string>
-              <key>options</key>
-              <array>
-                <string>-configuration Debug</string>
-                <string>-project SecondLife.xcodeproj</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 12</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Unix Makefiles'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Debug</string>
             </map>
-            <key>configure</key>
+            <key>DebugOS</key>
             <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Xcode'</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 2</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Unix Makefiles'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>DebugOS</string>
             </map>
-            <key>name</key>
-            <string>DebugOS</string>
-          </map>
-          <key>RelWithDebInfo</key>
-          <map>
-            <key>build</key>
+            <key>RelWithDebInfo</key>
             <map>
-              <key>arguments</key>
-              <array>
-                <string>|</string>
-                <string>grep</string>
-                <string>-v</string>
-                <string>setenv</string>
-              </array>
-              <key>command</key>
-              <string>xcodebuild</string>
-              <key>options</key>
-              <array>
-                <string>-configuration RelWithDebInfo</string>
-                <string>-project SecondLife.xcodeproj</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 12</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Unix Makefiles'</string>
+                </array>
+              </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
             </map>
-            <key>configure</key>
+            <key>RelWithDebInfoOS</key>
             <map>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Xcode'</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 2</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Unix Makefiles'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 12</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Unix Makefiles'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>make</string>
+                <key>options</key>
+                <array>
+                  <string>-j 2</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>'Unix Makefiles'</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>ReleaseOS</string>
             </map>
             <key>default</key>
-            <string>True</string>
-            <key>name</key>
-            <string>RelWithDebInfo</string>
-          </map>
-          <key>RelWithDebInfoOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>xcodebuild</string>
-              <key>options</key>
-              <array>
-                <string>-configuration RelWithDebInfo</string>
-                <string>-project SecondLife.xcodeproj</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Xcode'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>RelWithDebInfoOS</string>
-          </map>
-          <key>Release</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>|</string>
-                <string>grep</string>
-                <string>-v</string>
-                <string>setenv</string>
-              </array>
-              <key>command</key>
-              <string>xcodebuild</string>
-              <key>options</key>
-              <array>
-                <string>-configuration Release</string>
-                <string>-project SecondLife.xcodeproj</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Xcode'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>Release</string>
-          </map>
-          <key>ReleaseOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>xcodebuild</string>
-              <key>options</key>
-              <array>
-                <string>-configuration Release</string>
-                <string>-project SecondLife.xcodeproj</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Xcode'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>ReleaseOS</string>
+            <map>
+              <key>build</key>
+              <map>
+              </map>
+              <key>name</key>
+              <string>default</string>
+            </map>
           </map>
+          <key>name</key>
+          <string>linux</string>
         </map>
-        <key>name</key>
-        <string>darwin</string>
-      </map>
-      <key>linux</key>
-      <map>
-        <key>build_directory</key>
-        <string>build-linux-i686</string>
-        <key>configurations</key>
+        <key>windows</key>
         <map>
-          <key>Debug</key>
+          <key>build_directory</key>
+          <string>build-vc100</string>
+          <key>configurations</key>
           <map>
-            <key>build</key>
+            <key>Debug</key>
             <map>
-              <key>command</key>
-              <string>make</string>
-              <key>options</key>
-              <array>
-                <string>-j 12</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>BuildConsole</string>
+                <key>options</key>
+                <array>
+                  <string>/build</string>
+                  <string>"/cfg=Debug|Win32"</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>Debug</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Debug</string>
             </map>
-            <key>configure</key>
+            <key>DebugOS</key>
             <map>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Unix Makefiles'</string>
-              </array>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>msbuild.exe</string>
+                <key>options</key>
+                <array>
+                  <string>/p:Configuration=Debug</string>
+                  <string>/p:Platform=Win32</string>
+                  <string>/t:Build</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>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DFMOD=FALSE</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>DebugOS</string>
+            </map>
+            <key>RelWithDebInfo</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>BuildConsole</string>
+                <key>options</key>
+                <array>
+                  <string>/build</string>
+                  <string>"/cfg=RelWithDebInfo|Win32"</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>RelWithDebInfo</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                </array>
+              </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
+            </map>
+            <key>RelWithDebInfoOS</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>msbuild.exe</string>
+                <key>options</key>
+                <array>
+                  <string>/p:Configuration=RelWithDebInfo</string>
+                  <string>/p:Platform=Win32</string>
+                  <string>/t:Build</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>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DFMOD=FALSE</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>BuildConsole</string>
+                <key>options</key>
+                <array>
+                  <string>/build</string>
+                  <string>"/cfg=Release|Win32"</string>
+                  <string>"/CL_ADD=/m:1"</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>Release</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <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>
+                  <string>/p:useenv=true</string>
+                  <string>/verbosity:minimal</string>
+                  <string>/toolsversion:4.0</string>
+                  <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=TRUE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DFMOD=FALSE</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>ReleaseOS</string>
             </map>
-            <key>name</key>
-            <string>Debug</string>
-          </map>
-          <key>DebugOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>make</string>
-              <key>options</key>
-              <array>
-                <string>-j 2</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Unix Makefiles'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>DebugOS</string>
-          </map>
-          <key>RelWithDebInfo</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>make</string>
-              <key>options</key>
-              <array>
-                <string>-j 12</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Unix Makefiles'</string>
-              </array>
-            </map>
-            <key>default</key>
-            <string>True</string>
-            <key>name</key>
-            <string>RelWithDebInfo</string>
-          </map>
-          <key>RelWithDebInfoOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>make</string>
-              <key>options</key>
-              <array>
-                <string>-j 2</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Unix Makefiles'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>RelWithDebInfoOS</string>
-          </map>
-          <key>Release</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>make</string>
-              <key>options</key>
-              <array>
-                <string>-j 12</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>../indra</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Unix Makefiles'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>Release</string>
-          </map>
-          <key>ReleaseOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>command</key>
-              <string>make</string>
-              <key>options</key>
-              <array>
-                <string>-j 2</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>'Unix Makefiles'</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>ReleaseOS</string>
-          </map>
-          <key>default</key>
-          <map>
-            <key>build</key>
-            <map>
-            </map>
-            <key>name</key>
-            <string>default</string>
           </map>
+          <key>name</key>
+          <string>windows</string>
         </map>
-        <key>name</key>
-        <string>linux</string>
-      </map>
-      <key>windows</key>
-      <map>
-        <key>build_directory</key>
-        <string>build-vc100</string>
-        <key>configurations</key>
-        <map>
-          <key>Debug</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>SecondLife.sln</string>
-              </array>
-              <key>command</key>
-              <string>BuildConsole</string>
-              <key>options</key>
-              <array>
-                <string>/build</string>
-                <string>"/cfg=Debug|Win32"</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>..\indra</string>
-                <string>&amp;&amp;</string>
-                <string>..\indra\tools\vstool\VSTool.exe</string>
-                <string>--solution</string>
-                <string>SecondLife.sln</string>
-                <string>--config</string>
-                <string>Debug</string>
-                <string>--startup</string>
-                <string>secondlife-bin</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>"Visual Studio 10"</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>Debug</string>
-          </map>
-          <key>DebugOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>SecondLife.sln</string>
-              </array>
-              <key>command</key>
-              <string>msbuild.exe</string>
-              <key>options</key>
-              <array>
-                <string>/p:Configuration=Debug</string>
-                <string>/p:Platform=Win32</string>
-                <string>/t:Build</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>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>"Visual Studio 10"</string>
-                <string>-DUNATTENDED:BOOL=ON</string>
-                <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
-                <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                <string>-DUSE_KDU=FALSE</string>
-                <string>-DFMOD=FALSE</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>DebugOS</string>
-          </map>
-          <key>RelWithDebInfo</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>SecondLife.sln</string>
-              </array>
-              <key>command</key>
-              <string>BuildConsole</string>
-              <key>options</key>
-              <array>
-                <string>/build</string>
-                <string>"/cfg=RelWithDebInfo|Win32"</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>..\indra</string>
-                <string>&amp;&amp;</string>
-                <string>..\indra\tools\vstool\VSTool.exe</string>
-                <string>--solution</string>
-                <string>SecondLife.sln</string>
-                <string>--config</string>
-                <string>RelWithDebInfo</string>
-                <string>--startup</string>
-                <string>secondlife-bin</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>"Visual Studio 10"</string>
-              </array>
-            </map>
-            <key>default</key>
-            <string>True</string>
-            <key>name</key>
-            <string>RelWithDebInfo</string>
-          </map>
-          <key>RelWithDebInfoOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>SecondLife.sln</string>
-              </array>
-              <key>command</key>
-              <string>msbuild.exe</string>
-              <key>options</key>
-              <array>
-                <string>/p:Configuration=RelWithDebInfo</string>
-                <string>/p:Platform=Win32</string>
-                <string>/t:Build</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>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>"Visual Studio 10"</string>
-                <string>-DUNATTENDED:BOOL=ON</string>
-                <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
-                <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                <string>-DUSE_KDU=FALSE</string>
-                <string>-DFMOD=FALSE</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>RelWithDebInfoOS</string>
-          </map>
-          <key>Release</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>SecondLife.sln</string>
-              </array>
-              <key>command</key>
-              <string>BuildConsole</string>
-              <key>options</key>
-              <array>
-                <string>/build</string>
-                <string>"/cfg=Release|Win32"</string>
-                <string>"/CL_ADD=/m:1"</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>..\indra</string>
-                <string>&amp;&amp;</string>
-                <string>..\indra\tools\vstool\VSTool.exe</string>
-                <string>--solution</string>
-                <string>SecondLife.sln</string>
-                <string>--config</string>
-                <string>Release</string>
-                <string>--startup</string>
-                <string>secondlife-bin</string>
-              </array>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>"Visual Studio 10"</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>Release</string>
-          </map>
-          <key>ReleaseOS</key>
-          <map>
-            <key>build</key>
-            <map>
-              <key>arguments</key>
-              <array>
-                <string>SecondLife.sln</string>
-              </array>
-              <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>
-                <string>/p:useenv=true</string>
-                <string>/verbosity:minimal</string>
-                <string>/toolsversion:4.0</string>
-                <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
-              </array>
-            </map>
-            <key>configure</key>
-            <map>
-              <key>options</key>
-              <array>
-                <string>-G</string>
-                <string>"Visual Studio 10"</string>
-                <string>-DUNATTENDED:BOOL=ON</string>
-                <string>-DUSE_PRECOMPILED_HEADERS=ON</string>
-                <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                <string>-DUSE_KDU=FALSE</string>
-                <string>-DFMOD=FALSE</string>
-              </array>
-            </map>
-            <key>name</key>
-            <string>ReleaseOS</string>
-          </map>
-        </map>
-        <key>name</key>
-        <string>windows</string>
       </map>
     </map>
+    <key>type</key>
+    <string>autobuild</string>
+    <key>version</key>
+    <string>1.2</string>
   </map>
-  <key>type</key>
-  <string>autobuild</string>
-  <key>version</key>
-  <string>1.2</string>
-</map>
 </llsd>