diff --git a/autobuild.xml b/autobuild.xml
index 30e07bb12c..2352f9e579 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1599,22 +1599,149 @@
configure
name
Debug
+ OpenSourceDebug
+
+ OpenSourceRelWithDebInfo
+
+ configure
+
+ arguments
+
+ ../indra
+
+ command
+ cmake
+ options
+
+ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
+ -DUNATTENDED:BOOL=OFF
+ -DWORD_SIZE:STRING=32
+ -DROOT_PROJECT_NAME:STRING=SecondLife
+
+
+ name
+ OpenSourceRelWithDebInfo
+
+ OpenSourceRelease
+
+ configure
+
+ arguments
+
+ ../indra
+
+ command
+ cmake
+ options
+
+ -DCMAKE_BUILD_TYPE:STRING=Release
+ -DUNATTENDED:BOOL=OFF
+ -DWORD_SIZE:STRING=32
+ -DROOT_PROJECT_NAME:STRING=SecondLife
+
+
+ name
+ OpenSourceRelease
+
+ OpenSourceStandAloneDebug
+
+ configure
+
+ arguments
+
+ ../indra
+
+ command
+ cmake
+ options
+
+ -DCMAKE_BUILD_TYPE:STRING=Debug
+ -DUNATTENDED:BOOL=OFF
+ -DWORD_SIZE:STRING=32
+ -DROOT_PROJECT_NAME:STRING=SecondLife
+
+
+ name
+ OpenSourceStandAloneDebug
+
+ OpenSourceStandAloneRelWithDebInfo
+
+ configure
+
+ arguments
+
+ ../indra
+
+ command
+ cmake
+ options
+
+ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
+ -DUNATTENDED:BOOL=OFF
+ -DWORD_SIZE:STRING=32
+ -DROOT_PROJECT_NAME:STRING=SecondLife
+
+
+ name
+ OpenSourceStandAloneRelWithDebInfo
+
+ OpenSourceStandAloneRelease
+
+ configure
+
+ arguments
+
+ ../indra
+
+ command
+ cmake
+ options
+
+ -DCMAKE_BUILD_TYPE:STRING=Release
+ -DUNATTENDED:BOOL=OFF
+ -DWORD_SIZE:STRING=32
+ -DROOT_PROJECT_NAME:STRING=SecondLife
+
+
+ name
+ OpenSourceStandAloneRelease
+
RelWithDebInfo
build
@@ -1622,17 +1749,18 @@
configure
+ arguments
+
+ ../indra
+
command
cmake
options
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
- -DSTANDALONE:BOOL=OFF
-DUNATTENDED:BOOL=OFF
-DWORD_SIZE:STRING=32
-DROOT_PROJECT_NAME:STRING=SecondLife
- -DFMOD=TRUE
- -DINSTALL_PROPRIETARY=TRUE
name
@@ -1645,17 +1773,18 @@
configure
+ arguments
+
+ ../indra
+
command
cmake
options
-DCMAKE_BUILD_TYPE:STRING=Release
- -DSTANDALONE:BOOL=OFF
-DUNATTENDED:BOOL=OFF
-DWORD_SIZE:STRING=32
-DROOT_PROJECT_NAME:STRING=SecondLife
- -DFMOD=TRUE
- -DINSTALL_PROPRIETARY=TRUE
name
@@ -1692,19 +1821,174 @@
configure
- arguments
-
- ../indra
-
options
-G
'Xcode'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
name
Debug
+ OpenSourceDebug
+
+ build
+
+ command
+ xcodebuild
+ options
+
+ -configuration Debug
+ -project SecondLife.xcodeproj
+
+
+ configure
+
+ options
+
+ -G
+ 'Xcode'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceDebug
+
+ OpenSourceRelWithDebInfo
+
+ build
+
+ command
+ xcodebuild
+ options
+
+ -configuration RelWithDebInfo
+ -project SecondLife.xcodeproj
+
+
+ configure
+
+ options
+
+ -G
+ 'Xcode'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceRelWithDebInfo
+
+ OpenSourceRelease
+
+ build
+
+ command
+ xcodebuild
+ options
+
+ -configuration Release
+ -project SecondLife.xcodeproj
+
+
+ configure
+
+ options
+
+ -G
+ 'Xcode'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceRelease
+
+ OpenSourceStandAloneDebug
+
+ build
+
+ command
+ xcodebuild
+ options
+
+ -configuration Debug
+ -project SecondLife.xcodeproj
+
+
+ configure
+
+ options
+
+ -G
+ 'Xcode'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneDebug
+
+ OpenSourceStandAloneRelWithDebInfo
+
+ build
+
+ command
+ xcodebuild
+ options
+
+ -configuration RelWithDebInfo
+ -project SecondLife.xcodeproj
+
+
+ configure
+
+ options
+
+ -G
+ 'Xcode'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneRelWithDebInfo
+
+ OpenSourceStandAloneRelease
+
+ build
+
+ command
+ xcodebuild
+ options
+
+ -configuration Release
+ -project SecondLife.xcodeproj
+
+
+ configure
+
+ options
+
+ -G
+ 'Xcode'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneRelease
+
RelWithDebInfo
build
@@ -1726,14 +2010,13 @@
configure
- arguments
-
- ../indra
-
options
-G
'Xcode'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
default
@@ -1762,14 +2045,13 @@
configure
- arguments
-
- ../indra
-
options
-G
'Xcode'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
name
@@ -1798,19 +2080,168 @@
configure
- arguments
-
- ../indra
-
options
-G
'Unix Makefiles'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
name
Debug
+ OpenSourceDebug
+
+ build
+
+ command
+ make
+ options
+
+ -j 12
+
+
+ configure
+
+ options
+
+ -G
+ 'Unix Makefiles'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceDebug
+
+ OpenSourceRelWithDebInfo
+
+ build
+
+ command
+ make
+ options
+
+ -j 12
+
+
+ configure
+
+ options
+
+ -G
+ 'Unix Makefiles'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceRelWithDebInfo
+
+ OpenSourceRelease
+
+ build
+
+ command
+ make
+ options
+
+ -j 12
+
+
+ configure
+
+ options
+
+ -G
+ 'Unix Makefiles'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceRelease
+
+ OpenSourceStandAloneDebug
+
+ build
+
+ command
+ make
+ options
+
+ -j 12
+
+
+ configure
+
+ options
+
+ -G
+ 'Unix Makefiles'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneDebug
+
+ OpenSourceStandAloneRelWithDebInfo
+
+ build
+
+ command
+ make
+ options
+
+ -j 12
+
+
+ configure
+
+ options
+
+ -G
+ 'Unix Makefiles'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneRelWithDebInfo
+
+ OpenSourceStandAloneRelease
+
+ build
+
+ command
+ make
+ options
+
+ -j 12
+
+
+ configure
+
+ options
+
+ -G
+ 'Unix Makefiles'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneRelease
+
RelWithDebInfo
build
@@ -1824,14 +2255,13 @@
configure
- arguments
-
- ../indra
-
options
-G
'Unix Makefiles'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
default
@@ -1852,14 +2282,13 @@
configure
- arguments
-
- ../indra
-
options
-G
'Unix Makefiles'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
name
@@ -1901,19 +2330,198 @@
configure
- arguments
-
- ..\indra
-
options
-G
- "Visual Studio 8 2005"
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
name
Debug
+ OpenSourceDebug
+
+ build
+
+ arguments
+
+ SecondLife.sln
+
+ command
+ devenv.com
+ options
+
+ /build
+ Debug
+
+
+ configure
+
+ options
+
+ -G
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceDebug
+
+ OpenSourceRelWithDebInfo
+
+ build
+
+ arguments
+
+ SecondLife.sln
+
+ command
+ devenv.com
+ options
+
+ /build
+ RelWithDebInfo
+
+
+ configure
+
+ options
+
+ -G
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceRelWithDebInfo
+
+ OpenSourceRelease
+
+ build
+
+ arguments
+
+ SecondLife.sln
+
+ command
+ devenv.com
+ options
+
+ /build
+ Release
+
+
+ configure
+
+ options
+
+ -G
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=FALSE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceRelease
+
+ OpenSourceStandAloneDebug
+
+ build
+
+ arguments
+
+ SecondLife.sln
+
+ command
+ devenv.com
+ options
+
+ /build
+ Debug
+
+
+ configure
+
+ options
+
+ -G
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneDebug
+
+ OpenSourceStandAloneRelWithDebInfo
+
+ build
+
+ arguments
+
+ SecondLife.sln
+
+ command
+ devenv.com
+ options
+
+ /build
+ RelWithDebInfo
+
+
+ configure
+
+ options
+
+ -G
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneRelWithDebInfo
+
+ OpenSourceStandAloneRelease
+
+ build
+
+ arguments
+
+ SecondLife.sln
+
+ command
+ devenv.com
+ options
+
+ /build
+ Release
+
+
+ configure
+
+ options
+
+ -G
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=TRUE
+ -DINSTALL_PROPRIETARY=FALSE
+ -DFMOD=FALSE
+
+
+ name
+ OpenSourceStandAloneRelease
+
RelWithDebInfo
build
@@ -1932,14 +2540,13 @@
configure
- arguments
-
- ..\indra
-
options
-G
- "Visual Studio 8 2005"
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
default
@@ -1965,14 +2572,13 @@
configure
- arguments
-
- ..\indra
-
options
-G
- "Visual Studio 8 2005"
+ 'Visual Studio 8 2005'
+ -DSTANDALONE:BOOL=OFF
+ -DINSTALL_PROPRIETARY=TRUE
+ -DFMOD=TRUE
name