It's silly that this was necessary... but it was. AMD... :(

2015-02-25 21:11:06 -06:00
3243 changed files with 86735 additions and 70166 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+/installed.xml
+/indra/llcommon/llversionviewer.h
 /indra/build-*
 /indra/tools/vstool/obj/
 *.aps
@@ -10,14 +12,13 @@
 /indra/viewer-*
 /indra/newview/vivox-runtime/
 /indra/newview/dbghelp.dll
-indra/newview/res/viewer_icon.*
-indra/newview/res-sdl/viewer_icon.*
 /libraries/
 /lib/
 *.pyc
 *.orig
 *.rej
 *.bak
+*~
 *.DS_Store
 /LICENSES/
 /edited-files.txt
@@ -25,5 +26,12 @@ qtcreator-build/
 /.pc
 /build-*
 /viewer-*
+/indra/newview/res/viewerRes.rc
+/indra/newview/res/viewerRes_bc.rc
+/indra/newview/English.lproj/InfoPlist.strings
+/indra/newview/linux_tools/handle_secondlifeprotocol.sh
+/indra/newview/linux_tools/install.sh
+/indra/newview/linux_tools/refresh_desktop_app_entry.sh
+/indra/newview/linux_tools/wrapper.sh


--- a/AscentChangelog.txt
+++ b/AscentChangelog.txt
@@ -0,0 +1,81 @@
+->> Features implemented in Ascent:
+
+In-World:
+-------------------------------------------------
+* Alpha skins and Tattoo Layers
+* Inventory Pre-caching
+* Avatar Radar
+* Multiple Attachment Points
+* Idle time of avatars around you (Not perfect)
+* Client tags/coloring for various clients, and extra client definitions
+* Force Away button to fake being away if you really want to avoid someone :V
+* Double-Click teleport (Not all the functionality of Emerald yet)
+Preferences (Options are in Ascent Options):
+* Disable Look At
+* Disable Point At and beam end
+* Fetch inventory in background on login (No waiting for caching when searching)
+* Display your client tag to yourself
+* Display your client tag color to yourself
+* Rez objects as land group when possible
+* Some settings can now be saved per account after changing an option in the preferences. Currently affected settings:
+	Edit Beam color
+	Client Tag Color
+Communication Window:
+- Friend List:
+  * Friend List Online/Total counts (Not perfect)
+  * Shows what rights your friends have given you (Mod, See on map, Online)
+
+Chat Bar:
+* Emerald-style Chatbar as Commandline (See Preferences)
+* MU-style poses.
+* OOC Auto-close.
+
+Instant Messages:
+* MU-style poses.
+* OOC Auto-close.
+
+Advanced -> Ascent:
+* Fake Away Status
+* Force Ground Sit (Lets you sit anywhere)
+* Phantom Avatar (Prevents you visually from being pushed.)
+* Toggle IM Notification (Ability to hide '%n is typing...' notification from being sent.)
+* Close All Dialogs
+* Message Log
+* Message Builder
+* Sound Explorer
+* Asset Blacklist
+* AO options
+
+Object Pie Menus:
+* Measure: Select on one object, then another, to get the exact distance between the two
+* Data: Reports prim rotation and position in a format usable in LSL scripts.
+* Script Counter
+
+Self Pie Menu:
+* Animation Explorer
+
+Agent Pie Menus:
+* Script Counter
+* Copy Agent UUID
+* Debug
+
+Parcel Window:
+-------------------------------------------------
+- General tab:
+- Objects tab:
+  * In Sim/Online/Offline indicators for Parcel Object Owner listings (Online is currently wonky - This is an issue with SL, Emerald has the same problem.)
+
+Build Window:
+-------------------------------------------------
+- General tab:
+  * Last Owner shown in Build "General" Tab
+  * Group object is set to has a "View" button to see the group's profile
+  * Copy Object Key button
+- Build Tab:
+  * Copy/Paste Position buttons
+  * Copy/Paste Size buttons
+  * Copy/Paste Rotation buttons
+  * Copy/Paste Primitive Parameters buttons
+
+Known issues:
+Online/Total counts in the friends list sometimes go haywire. Not often or by a large margin, but it happens.
--- a/autobuild.xml
+++ b/autobuild.xml
--- a/doc/asset_urls.txt
+++ b/doc/asset_urls.txt
@@ -0,0 +1,5 @@
+SLASSET_LIBS_WIN32=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-win32-libs-oss-viewer-1.23.4.0.zip
+SLASSET_MD5=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/md5sums-oss-viewer-1.23.4.0.txt
+SLASSET_LIBS_DARWIN=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-darwin-libs-oss-viewer-1.23.4.0.tar.gz
+SLASSET_ART=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-artwork-oss-viewer-1.23.4.0.zip
+SLASSET_LIBS_LINUXI386=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-linux-libs-oss-viewer-1.23.4.0.tar.gz
--- a/doc/releasenotes-where.txt
+++ b/doc/releasenotes-where.txt
@@ -0,0 +1,5 @@
+For full release notes, see:
+	http://wiki.secondlife.com/wiki/Release_Notes
+
+For a log of viewer changes, see:
+	doc/viewer-changes.txt
--- a/doc/viewer-changes.txt
+++ b/doc/viewer-changes.txt
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -3,12 +3,19 @@
 # cmake_minimum_required should appear before any
 # other commands to guarantee full compatibility
 # with the version specified
-## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly
-if(WIN32)
-  cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
-else()
-  cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
-endif()
+
+cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
+
+# Eventually the third-party support modules (cmake/*.cmake) should
+# know the full path to all libraries.  Until that happens we need
+# per-configuration link directory "libraries/<arch>/lib/debug" for
+# Debug and "libraries/<arch>/lib/release" for Release,
+# RelWithDebInfo, and MinSizeRel.  CMake 2.6 does not directly support
+# per-configuration link directory specification.  However, we can set
+# CMP0003 to OLD and link to one library (apr) on a per-configuration
+# basis to convince CMake to add the proper link directory.  This line
+# can be removed when we use full paths for all libraries.
+cmake_policy(SET CMP0003 OLD)

 set(ROOT_PROJECT_NAME "Singularity" CACHE STRING
    "The root project/makefile/solution name. Defaults to Singularity.")
@@ -17,12 +24,24 @@ project(${ROOT_PROJECT_NAME})
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

 include(Variables)
+
+# Load versions now.  Install locations need them.
 include(BuildVersion)

-if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+include(UnixInstall)
+
+if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING
      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
-endif (NOT CMAKE_BUILD_TYPE)
+endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+
+# Create a 'prepare' target in which to perform setup actions.  This
+# must be the first target created so other targets can depend on it.
+if(NOT STANDALONE)
+  # We prepare prebuilt binaries when not building standalone.
+  set(prepare_depends ${CMAKE_BINARY_DIR}/prepare/prebuilt)
+endif(NOT STANDALONE)
+add_custom_target(prepare DEPENDS ${prepare_depends})

 add_subdirectory(cmake)
 add_subdirectory(${LIBS_OPEN_PREFIX}aistatemachine)
@@ -45,6 +64,12 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)

+if(STANDALONE)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llqtwebkit)
+endif(STANDALONE)
+
+#add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
+
 if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
  add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts)
 endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
@@ -56,7 +81,29 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llui)
 # viewer plugins directory
 add_subdirectory(${LIBS_OPEN_PREFIX}plugins)

+# llplugin testbed code (is this the right way to include it?)
+#if (NOT LINUX)
+#  add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
+#endif (NOT LINUX)
+
 add_subdirectory(${VIEWER_PREFIX}newview/statemachine)
 add_subdirectory(${VIEWER_PREFIX}newview)
-add_dependencies(viewer singularity-bin)
+add_dependencies(viewer secondlife-bin)

+# The use_prebuilt_binary macro in cmake/Prebuilt.cmake records
+# packages in the PREBUILT property of the 'prepare' target.
+get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
+
+# Create a script to download the needed binaries.
+configure_file(${CMAKE_SOURCE_DIR}/cmake/DownloadPrebuilt.cmake.in
+               ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake @ONLY)
+
+# Drive the download script at build time.  Depend on 'install.xml'
+# to aqcuire new binaries when needed.
+add_custom_command(
+  COMMENT "Obtaining prebuilt binaries..."
+  OUTPUT ${CMAKE_BINARY_DIR}/prepare/prebuilt
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
+  DEPENDS ${CMAKE_SOURCE_DIR}/../install.xml
+          ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
+  )
--- a/indra/aistatemachine/CMakeLists.txt
+++ b/indra/aistatemachine/CMakeLists.txt
@@ -39,3 +39,5 @@ set_source_files_properties(${aistatemachine_HEADER_FILES}
 list(APPEND aistatemachine_SOURCE_FILES ${aistatemachine_HEADER_FILES})

 add_library (aistatemachine ${aistatemachine_SOURCE_FILES})
+add_dependencies(aistatemachine prepare)
+
--- a/indra/aistatemachine/aistatemachine.cpp
+++ b/indra/aistatemachine/aistatemachine.cpp
@@ -320,7 +320,7 @@ void print_statemachine_diagnostics(U64 total_clocks, AIStateMachine::StateTimer

 	AIStateMachine::StateTimerBase::DumpTimers(msg);

-	LL_WARNS() << msg.str() << LL_ENDL;
+	llwarns << msg.str() << llendl;
 }
 #endif

@@ -440,7 +440,7 @@ void AIStateMachine::multiplex(event_type event)
 	// our need to run (by us having set need_run), so there is no need to run
 	// ourselves.
 	llassert(!mMultiplexMutex.isSelfLocked());		// We may never enter recursively!
-	if (!mMultiplexMutex.try_lock())
+	if (!mMultiplexMutex.tryLock())
 	{
 	  Dout(dc::statemachine(mSMDebug), "Leaving because it is already being run [" << (void*)this << "]");
 	  return;
@@ -762,7 +762,7 @@ void AIStateMachine::multiplex(event_type event)
 		//=========================================

 		// Release the lock on mMultiplexMutex *first*, before releasing the lock on mState,
-		// to avoid to ever call the try_lock() and fail, while this thread isn't still
+		// to avoid to ever call the tryLock() and fail, while this thread isn't still
 		// BEFORE the critical area of mState!

 		mMultiplexMutex.unlock();
@@ -1262,9 +1262,9 @@ void AIStateMachine::abort(void)
 	multiplex(insert_abort);
  }
  // Block until the current run finished.
-  if (!mRunMutex.try_lock())
+  if (!mRunMutex.tryLock())
  {
-	LL_WARNS() << "AIStateMachine::abort() blocks because the statemachine is still executing code in another thread." << LL_ENDL;
+	llwarns << "AIStateMachine::abort() blocks because the statemachine is still executing code in another thread." << llendl;
 	mRunMutex.lock();
  }
  mRunMutex.unlock();
@@ -1463,6 +1463,6 @@ void stopEngineThread(void)
  {
 	ms_sleep(10);
  }
-  LL_INFOS() << "State machine thread" << (!AIEngineThread::sInstance->isStopped() ? " not" : "") << " stopped after " << ((400 - count) * 10) << "ms." << LL_ENDL;
+  llinfos << "State machine thread" << (!AIEngineThread::sInstance->isStopped() ? " not" : "") << " stopped after " << ((400 - count) * 10) << "ms." << llendl;
 }

--- a/indra/aistatemachine/aistatemachinethread.cpp
+++ b/indra/aistatemachine/aistatemachinethread.cpp
@@ -149,7 +149,7 @@ void AIStateMachineThreadBase::abort_impl(void)
 	{
 	  // The thread is still happily running (and will clean up itself).
 	  // Lets make sure we're not flooded with this situation.
-	  LL_WARNS() << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << LL_ENDL;
+	  llwarns << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << llendl;
 	}
  }
 }
--- a/indra/aistatemachine/aistatemachinethread.h
+++ b/indra/aistatemachine/aistatemachinethread.h
@@ -34,7 +34,6 @@
 #include "aistatemachine.h"
 #include "llthread.h"
 #include "aithreadsafe.h"
-#include <boost/format.hpp>

 #ifdef EXAMPLE_CODE	// undefined

@@ -236,7 +235,7 @@ class AIStateMachineThread : public AIStateMachineThreadBase {
 	/*virtual*/ const char* getName() const
 	{
 #define STRIZE(arg) #arg
-		return (boost::format("%1%%2%%3%") % "AIStateMachineThread<" % STRIZE(THREAD_IMPL) % ">").str().c_str();
+		return "AIStateMachineThread<"STRIZE(THREAD_IMPL)">";
 #undef STRIZE
 	}

--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -40,6 +40,23 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
 # Platform-specific compilation flags.

 if (WINDOWS)
+  # Various libs are compiler specific, generate some variables here we can just use
+  # when we require them instead of reimplementing the test each time.
+  if (MSVC10)
+    set(MSVC_DIR 10.0)
+    set(MSVC_SUFFIX 100)
+  endif (MSVC10)
+  if (MSVC11)
+    set(MSVC_DIR 11.0)
+    set(MSVC_SUFFIX 110)
+  endif (MSVC11)
+
+  # Remove default /Zm1000 flag that cmake inserts
+  string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+  # Always use /Zm140
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm140")
+
  # Don't build DLLs.
  set(BUILD_SHARED_LIBS OFF)

@@ -49,78 +66,50 @@ if (WINDOWS)
      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
      CACHE STRING "C++ compiler release-with-debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /Zo /MD /MP /Ob2 /Zc:inline /fp:fast -D_ITERATOR_DEBUG_LEVEL=0"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /fp:fast -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
      CACHE STRING "C++ compiler release options" FORCE)
  set(CMAKE_C_FLAGS_RELEASE
      "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /fp:fast"
      CACHE STRING "C compiler release options" FORCE)
-
-  if (WORD_SIZE EQUAL 32)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-  endif (WORD_SIZE EQUAL 32)
-
-  if (USE_LTO)
-    if(INCREMENTAL_LINK)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG:INCREMENTAL")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG:INCREMENTAL")
-      set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG:INCREMENTAL")
-    else(INCREMENTAL_LINK)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
-      set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
-    endif(INCREMENTAL_LINK)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF /LTCG")
-    set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
-  elseif (INCREMENTAL_LINK)
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS} /INCREMENTAL /VERBOSE:INCR")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL /VERBOSE:INCR")
-  else ()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /INCREMENTAL:NO")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /INCREMENTAL:NO")
-  endif ()
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")

  set(CMAKE_CXX_STANDARD_LIBRARIES "")
  set(CMAKE_C_STANDARD_LIBRARIES "")

  add_definitions(
      /DLL_WINDOWS=1
-      /DNOMINMAX
      /DUNICODE
-      /D_UNICODE
+      /D_UNICODE 
      /GS
      /TP
      /W3
      /c
      /Zc:forScope
-      /Zc:rvalueCast
-      /Zc:wchar_t
+	    /Zc:wchar_t-
      /nologo
      /Oy-
-      /Zm140
-      /wd4267
-      /wd4244
      )
+  
+  # SSE2 is implied on win64
+  if(WORD_SIZE EQUAL 32)
+    add_definitions(/arch:SSE2)
+  else(WORD_SIZE EQUAL 32)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4267 /wd4250 /wd4244")
+  endif(WORD_SIZE EQUAL 32)

-  if (USE_LTO)
-    add_compile_options(
-        /GL
-        /Gy
-        /Gw
-        )
-  endif (USE_LTO)
-
-  if (WORD_SIZE EQUAL 32)
-    add_compile_options(/arch:SSE2)
-  endif (WORD_SIZE EQUAL 32)
+  # configure win32 API for windows XP+ compatibility
+  set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+  add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")

+  # Are we using the crummy Visual Studio KDU build workaround?
  if (NOT DISABLE_FATAL_WARNINGS)
    add_definitions(/WX)
  endif (NOT DISABLE_FATAL_WARNINGS)

-  # configure win32 API for windows Vista+ compatibility
-  set(WINVER "0x0600" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
-  add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
+
 endif (WINDOWS)

 set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")
@@ -141,10 +130,7 @@ if (LINUX)
      -pthread
      )

-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ")

  # Don't catch SIGCHLD in our base application class for the viewer
  # some of our 3rd party libs may need their *own* SIGCHLD handler to work.  Sigh!
@@ -199,14 +185,16 @@ if (LINUX)

    # End of hacks.

+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
    if (NOT STANDALONE)
      # this stops us requiring a really recent glibc at runtime
      add_definitions(-fno-stack-protector)
    endif (NOT STANDALONE)
    if (${ARCH} STREQUAL "x86_64")
-      add_definitions(-pipe)
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math")
+      add_definitions(-DLINUX64=1 -pipe)
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math")
      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math")
    else (${ARCH} STREQUAL "x86_64")
@@ -221,6 +209,11 @@ if (LINUX)
      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
    endif (${ARCH} STREQUAL "x86_64")
  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    if (NOT STANDALONE)
+      # this stops us requiring a really recent glibc at runtime
+      add_definitions(-fno-stack-protector)
+    endif (NOT STANDALONE)
+
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
@@ -228,6 +221,12 @@ if (LINUX)
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+
+    if (NOT STANDALONE)
+      # this stops us requiring a really recent glibc at runtime
+      add_definitions(-fno-stack-protector)
+    endif (NOT STANDALONE)
+
    if (NOT STANDALONE)
      set(MARCH_FLAG " -axsse4.1 -msse2")
    endif (NOT STANDALONE)
@@ -307,14 +306,13 @@ if (STANDALONE)
  add_definitions(-DLL_STANDALONE=1)
 else (STANDALONE)
  set(${ARCH}_linux_INCLUDES
+      ELFIO
      atk-1.0
-      cairo
      glib-2.0
-      gdk-pixbuf-2.0
      gstreamer-0.10
      gtk-2.0
+      freetype2
      pango-1.0
-      pixman-1
      )
 endif (STANDALONE)

--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -1,3 +1,4 @@
+include(BerkeleyDB)
 include(Linking)
 include(Prebuilt)

@@ -12,41 +13,36 @@ if (STANDALONE)
 else (STANDALONE)
  use_prebuilt_binary(apr_suite)
  if (WINDOWS)
-    if (LLCOMMON_LINK_SHARED)
-      set(APR_selector "lib")
-    else (LLCOMMON_LINK_SHARED)
-      set(APR_selector "")
-    endif (LLCOMMON_LINK_SHARED)
    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
      )
    set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
      )
    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
      )
-    if(NOT LLCOMMON_LINK_SHARED)
-      list(APPEND APR_LIBRARIES Rpcrt4)
-    endif(NOT LLCOMMON_LINK_SHARED)
  elseif (DARWIN)
-    if (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "0.dylib")
-      set(APRUTIL_selector "0.dylib")
-    else (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "a")
-      set(APRUTIL_selector "a")
-    endif (LLCOMMON_LINK_SHARED)
-    set(APR_LIBRARIES libapr-1.${APR_selector})
-    set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
+    set(APR_LIBRARIES 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
+      )
+    set(APRUTIL_LIBRARIES 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib
+      )
    set(APRICONV_LIBRARIES iconv)
  else (WINDOWS)
    set(APR_LIBRARIES apr-1)
    set(APRUTIL_LIBRARIES aprutil-1)
    set(APRICONV_LIBRARIES iconv)
  endif (WINDOWS)
-  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
+  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
+
+  if (LINUX)
+    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
+  endif (LINUX)
 endif (STANDALONE)
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -8,8 +8,8 @@ if (STANDALONE)
  pkg_check_modules(VORBISENC REQUIRED vorbisenc)
  pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
 else (STANDALONE)
-  use_prebuilt_binary(ogg_vorbis)
-  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  use_prebuilt_binary(ogg-vorbis)
+  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
  set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
  set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})

--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -0,0 +1,17 @@
+include(Prebuilt)
+
+set(DB_FIND_QUIETLY ON)
+set(DB_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindBerkeleyDB)
+else (STANDALONE)
+  if (LINUX)
+    # Need to add dependency pthread explicitely to support ld.gold.
+    use_prebuilt_binary(db)
+    set(DB_LIBRARIES db-5.1 pthread)
+  else (LINUX)
+    set(DB_LIBRARIES db-4.2)
+  endif (LINUX)
+  set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+endif (STANDALONE)
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -11,8 +11,8 @@ if (STANDALONE)
  find_package(Boost 1.51.0 COMPONENTS date_time filesystem program_options regex system thread wave context)
 else (STANDALONE)
  use_prebuilt_binary(boost)
-  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-  set(Boost_VERSION "1.60")
+  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(Boost_VERSION "1.52")

  if (WINDOWS)
    set(Boost_CONTEXT_LIBRARY 
--- a/indra/cmake/BuildPackagesInfo.cmake
+++ b/indra/cmake/BuildPackagesInfo.cmake
@@ -1,11 +0,0 @@
-# -*- cmake -*-
-# Construct the version and copyright information based on package data.
-include(Python)
-include(Variables)
-
-add_custom_command(OUTPUT packages-info.txt
-  COMMENT "Generating packages-info.txt for the about box"
-  MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
-  DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
-  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py -p=${AUTOBUILD_PLATFORM_NAME} > packages-info.txt
-  )
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -1,54 +1,87 @@
 # -*- cmake -*-
-# Construct the viewer version number based on the indra/VIEWER_VERSION file

-if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/newview/
-    set(VIEWER_VERSION_BASE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/newview/VIEWER_VERSION.txt")
+# Read version components from the header file.
+file(STRINGS ${LIBS_OPEN_DIR}/llcommon/llversionviewer.h.in lines
+   REGEX " LL_VERSION_")
+foreach(line ${lines})
+  string(REGEX REPLACE ".*LL_VERSION_([A-Z]+).*" "\\1" comp "${line}")
+  string(REGEX REPLACE ".* = ([0-9]+);.*" "\\1" value "${line}")
+  set(v${comp} "${value}")
+endforeach(line)

-    if ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
-        file(STRINGS ${VIEWER_VERSION_BASE_FILE} VIEWER_SHORT_VERSION REGEX "^[0-9]+\\.[0-9]+\\.[0-9]+")
-        string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" VIEWER_VERSION_MAJOR ${VIEWER_SHORT_VERSION})
-        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" VIEWER_VERSION_MINOR ${VIEWER_SHORT_VERSION})
-        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" VIEWER_VERSION_PATCH ${VIEWER_SHORT_VERSION})
+execute_process(
+    COMMAND git rev-list HEAD
+    OUTPUT_VARIABLE GIT_REV_LIST_STR
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)

-        if (DEFINED ENV{revision})
-           set(VIEWER_VERSION_REVISION $ENV{revision})
-           message("Revision (from environment): ${VIEWER_VERSION_REVISION}")
+if(GIT_REV_LIST_STR)
+  string(REPLACE "\n" ";" GIT_REV_LIST ${GIT_REV_LIST_STR})
+else()
+  string(REPLACE "\n" ";" GIT_REV_LIST "")
+endif()

-        else (DEFINED ENV{revision})
-          execute_process(
-                       COMMAND git rev-list HEAD
-                       OUTPUT_VARIABLE GIT_REV_LIST_STR
-                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                       OUTPUT_STRIP_TRAILING_WHITESPACE
-                       )
+if(GIT_REV_LIST)
+  list(LENGTH GIT_REV_LIST vBUILD)
+else()
+  set(vBUILD 99)
+endif()

-            if(GIT_REV_LIST_STR)
-              string(REPLACE "\n" ";" GIT_REV_LIST ${GIT_REV_LIST_STR})
-            else()
-              string(REPLACE "\n" ";" GIT_REV_LIST "")
-            endif()
+configure_file(
+    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h.in
+    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h
+)

-            if(GIT_REV_LIST)
-              list(LENGTH GIT_REV_LIST VIEWER_VERSION_REVISION)
-            else(GIT_REV_LIST)
-              set(VIEWER_VERSION_REVISION 99)
-            endif(GIT_REV_LIST)
-        endif (DEFINED ENV{revision})
-        message("Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
-    else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
-        message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'") 
-    endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
+if (WINDOWS)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc
+   )
+   
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes_bc.rc.in
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes_bc.rc
+   )
+endif (WINDOWS)

-    if ("${VIEWER_VERSION_REVISION}" STREQUAL "")
-      message("Ultimate fallback, revision was blank or not set: will use 0")
-      set(VIEWER_VERSION_REVISION 0)
-    endif ("${VIEWER_VERSION_REVISION}" STREQUAL "")
+if (DARWIN)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in
+       ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings
+   )
+endif (DARWIN)

-    set(VIEWER_CHANNEL_VERSION_DEFINES
-        "LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\""
-        "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}"
-        "LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
-        "LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"
-        "LL_VIEWER_VERSION_BUILD=${VIEWER_VERSION_REVISION}"
-        )
-endif (NOT DEFINED VIEWER_SHORT_VERSION)
+if (LINUX)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh
+       @ONLY
+   )
+endif (LINUX)
+
+# Compose the version.
+set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
+if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(STATUS "Version is ${viewer_VERSION}")
+else (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(FATAL_ERROR "Could not determine version (${viewer_VERSION})")
+endif (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+
+# Report version to caller.
+#set(viewer_VERSION "${viewer_VERSION}" PARENT_SCOPE)
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -13,12 +13,12 @@ else (STANDALONE)
        add_definitions("-DCARES_STATICLIB")
        set(CARES_LIBRARIES areslib)
    elseif (DARWIN)
-        set(CARES_LIBRARIES 
-          debug libcares.a
-          optimized libcares.a
+        set(CARES_LIBRARIES
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
          )
    else (WINDOWS)
        set(CARES_LIBRARIES cares)
    endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
+    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
 endif (STANDALONE)
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -1,45 +0,0 @@
-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-
-if (USESYSTEMLIBS)
-    set(CEFPLUGIN OFF CACHE BOOL
-        "CEFPLUGIN support for the llplugin/llmedia test apps.")
-else (USESYSTEMLIBS)
-    use_prebuilt_binary(llceflib)
-    set(CEFPLUGIN ON CACHE BOOL
-        "CEFPLUGIN support for the llplugin/llmedia test apps.")
-        set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)
-endif (USESYSTEMLIBS)
-
-if (WINDOWS)
-    set(CEF_PLUGIN_LIBRARIES
-        libcef.lib
-        libcef_dll_wrapper.lib
-        llceflib.lib
-    )
-elseif (DARWIN)
-    FIND_LIBRARY(APPKIT_LIBRARY AppKit)
-    if (NOT APPKIT_LIBRARY)
-        message(FATAL_ERROR "AppKit not found")
-    endif()
-
-    FIND_LIBRARY(CEF_LIBRARY "Chromium Embedded Framework" ${ARCH_PREBUILT_DIRS_RELEASE})
-    if (NOT CEF_LIBRARY)
-        message(FATAL_ERROR "CEF not found")
-    endif()
-
-    set(CEF_PLUGIN_LIBRARIES
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libLLCefLib.a
-        ${APPKIT_LIBRARY}
-        ${CEF_LIBRARY}
-       )
-
-elseif (LINUX)
-    set(CEF_PLUGIN_LIBRARIES
-       llceflib
-       cef_dll_wrapper
-       cef
-    )
-endif (WINDOWS)
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -12,30 +12,36 @@ set(cmake_SOURCE_FILES
    APR.cmake
    Audio.cmake
    BasicPluginBase.cmake
+    BerkeleyDB.cmake
    Boost.cmake
    BuildVersion.cmake
    CARes.cmake
-    CEFPlugin.cmake
    CMakeCopyIfDifferent.cmake
    CURL.cmake
    Colladadom.cmake
    ConfigurePkgConfig.cmake
-    Copy3rdPartyLibs.cmake
+    CopyBackToSource.cmake
+    CopyWinLibs.cmake
    Cwdebug.cmake
    DBusGlib.cmake
-    DeploySharedLibs.cmake
+    DirectX.cmake
+    DownloadPrebuilt.cmake.in
+    ELFIO.cmake
    EXPAT.cmake
    ExamplePlugin.cmake
-    FMODSTUDIO.cmake
+    FMOD.cmake
+    FMODEX.cmake
    FindAPR.cmake
-    FindAutobuild.cmake
+    FindBerkeleyDB.cmake
    FindCARes.cmake
    FindColladadom.cmake
+    FindELFIO.cmake
    FindGLOD.cmake
    FindGoogleBreakpad.cmake
    FindGooglePerfTools.cmake
    FindHunSpell.cmake
    FindJsonCpp.cmake
+    FindLLQtWebkit.cmake
    FindNDOF.cmake
    FindOpenJPEG.cmake
    FindTut.cmake
@@ -65,8 +71,8 @@ set(cmake_SOURCE_FILES
    LLPrimitive.cmake
    LLPhysicsExtensions.cmake
    LLSharedLibs.cmake
+    LLQtWebkit.cmake
    LLRender.cmake
-    LLSharedLibs.cmake
    LLUI.cmake
    LLVFS.cmake
    LLWindow.cmake
@@ -85,6 +91,7 @@ set(cmake_SOURCE_FILES
    Prebuilt.cmake
    PulseAudio.cmake
    Python.cmake
+    Qt4.cmake
    QuickTimePlugin.cmake
    RunBuildTest.cmake
    StateMachine.cmake
@@ -94,7 +101,7 @@ set(cmake_SOURCE_FILES
    UnixInstall.cmake
    Variables.cmake
    ViewerMiscLibs.cmake
-    WinManifest.cmake
+    WebKitLibPlugin.cmake
    XmlRpcEpi.cmake
    ZLIB.cmake
    )
@@ -103,6 +110,7 @@ source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})

 set(master_SOURCE_FILES
    ../CMakeLists.txt
+    ../develop.py
    )

 source_group("Master Rules" FILES ${master_SOURCE_FILES})
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -13,8 +13,10 @@ else (STANDALONE)
    debug libcurld
    optimized libcurl)
  else (WINDOWS)
-    use_prebuilt_binary(libidn)
-    set(CURL_LIBRARIES curl idn)
+    set(CURL_LIBRARIES curl)
+    if(LINUX AND WORD_SIZE EQUAL 64)
+      list(APPEND CURL_LIBRARIES idn)
+    endif(LINUX AND WORD_SIZE EQUAL 64)
  endif (WINDOWS)
-  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
--- a/indra/cmake/Colladadom.cmake
+++ b/indra/cmake/Colladadom.cmake
@@ -1,7 +1,6 @@
 # -*- cmake -*-

 include(Prebuilt)
-include(Boost)

 set(COLLADADOM_FIND_QUIETLY OFF)
 set(COLLADADOM_FIND_REQUIRED ON)
@@ -10,22 +9,32 @@ if (STANDALONE)
  include (FindColladadom)
 else (STANDALONE)
  use_prebuilt_binary(colladadom)
+
+  if (NOT WINDOWS AND NOT LINUX)
+	use_prebuilt_binary(pcre)
+  endif (NOT WINDOWS AND NOT LINUX)
+
+  if (NOT DARWIN AND NOT WINDOWS)
+	use_prebuilt_binary(libxml)
+  endif (NOT DARWIN AND NOT WINDOWS)
+
  set(COLLADADOM_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/collada
-      ${LIBS_PREBUILT_DIR}/include/collada/1.4
-      )
+	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada
+	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada/1.4
+	  )

  if (WINDOWS)
-    set(COLLADADOM_LIBRARIES
-        debug libcollada14dom23-sd
-        optimized libcollada14dom23-s
-        )
-  else(WINDOWS)
-    set(COLLADADOM_LIBRARIES
-        debug collada14dom-d
-        optimized collada14dom
-        minizip
-        )
+	  add_definitions(-DDOM_DYNAMIC)
+	  set(COLLADADOM_LIBRARIES 
+		  debug libcollada14dom22-d
+		  optimized libcollada14dom22
+		  )
+  else (WINDOWS)
+	  set(COLLADADOM_LIBRARIES 
+		  collada14dom
+		  minizip
+		  xml2
+		  )
  endif (WINDOWS)
 endif (STANDALONE)

--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -1,241 +0,0 @@
-# -*- cmake -*-
-
-# The copy_win_libs folder contains file lists and a script used to
-# copy dlls, exes and such needed to run the SecondLife from within
-# VisualStudio.
-
-include(CMakeCopyIfDifferent)
-include(Linking)
-
-###################################################################
-# set up platform specific lists of files that need to be copied
-###################################################################
-if(WINDOWS)
-    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug")
-    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release")
-
-    #*******************************
-    # VIVOX - *NOTE: no debug version
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        SLVoice.exe
-        ca-bundle.crt
-        libsndfile-1.dll
-        vivoxplatform.dll
-        vivoxsdk.dll
-        ortp.dll
-        zlib1.dll
-        vivoxoal.dll
-        )
-
-    #*******************************
-    # Misc shared libs 
-
-    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
-    set(debug_files
-        libapr-1.dll
-        libaprutil-1.dll
-        libapriconv-1.dll
-        ssleay32.dll
-        libeay32.dll
-        glod.dll    
-        libhunspell.dll
-        )
-
-    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(release_files
-        libapr-1.dll
-        libaprutil-1.dll
-        libapriconv-1.dll
-        ssleay32.dll
-        libeay32.dll
-        glod.dll
-        libhunspell.dll
-        )
-
-    if(NOT DISABLE_TCMALLOC)
-      set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
-      set(release_files ${release_files} libtcmalloc_minimal.dll)
-    endif(NOT DISABLE_TCMALLOC)
-
-    if (FMODSTUDIO)
-      if(WORD_SIZE STREQUAL 64)
-        set(debug_files ${debug_files} fmodL64.dll)
-        set(release_files ${release_files} fmod64.dll)
-      else(WORD_SIZE STREQUAL 64)
-        set(debug_files ${debug_files} fmodL.dll)
-        set(release_files ${release_files} fmod.dll)
-      endif(WORD_SIZE STREQUAL 64)
-    endif (FMODSTUDIO)
-elseif(DARWIN)
-    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
-    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
-
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        SLVoice
-        ca-bundle.crt
-        libsndfile.dylib
-        libvivoxoal.dylib
-        libortp.dylib
-        libvivoxplatform.dylib
-        libvivoxsdk.dylib
-       )
-    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
-    set(debug_files
-       )
-    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(release_files
-        libapr-1.0.dylib
-        libapr-1.dylib
-        libaprutil-1.0.dylib
-        libaprutil-1.dylib
-        libexception_handler.dylib
-        libexpat.1.5.2.dylib
-        libexpat.dylib
-        libGLOD.dylib
-        libhunspell-1.3.0.dylib
-        libndofdev.dylib
-       )
-
-    if (FMODSTUDIO)
-      set(debug_files ${debug_files} libfmodL.dylib)
-      set(release_files ${release_files} libfmod.dylib)
-    endif (FMODSTUDIO)
-
-elseif(LINUX)
-    # linux is weird, multiple side by side configurations aren't supported
-    # and we don't seem to have any debug shared libs built yet anyways...
-    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}")
-    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
-
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        libsndfile.so.1
-        libortp.so
-        libvivoxoal.so.1
-        libvivoxplatform.so
-        libvivoxsdk.so
-        SLVoice
-        # ca-bundle.crt   #No cert for linux.  It is actually still 3.2SDK.
-       )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
-    set(debug_files
-       )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    # *FIX - figure out what to do with duplicate libalut.so here -brad
-    set(release_files
-        libapr-1.so.0
-        libaprutil-1.so.0
-        libatk-1.0.so
-        libexpat.so
-        libexpat.so.1
-        libfreetype.so.6.12.3
-        libfreetype.so.6
-        libfreetype.so
-        libGLOD.so
-        libgmodule-2.0.so
-        libgobject-2.0.so
-        libopenal.so
-        libfontconfig.so.1.8.0
-        libfontconfig.so.1
-        libfontconfig.so
-       )
-
-    if (USE_TCMALLOC)
-      set(release_files ${release_files} "libtcmalloc_minimal.so")
-    endif (USE_TCMALLOC)
-
-    if (FMODSTUDIO)
-      set(debug_files ${debug_files} "libfmodL.so")
-      set(release_files ${release_files} "libfmod.so")
-    endif (FMODSTUDIO)
-
-else(WINDOWS)
-    message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
-    set(vivox_files "")
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/debug")
-    set(debug_files "")
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/release")
-    set(release_files "")
-
-    set(debug_llkdu_src "")
-    set(debug_llkdu_dst "")
-    set(release_llkdu_src "")
-    set(release_llkdu_dst "")
-    set(relwithdebinfo_llkdu_dst "")
-endif(WINDOWS)
-
-
-################################################################
-# Done building the file lists, now set up the copy commands.
-################################################################
-
-copy_if_different(
-    ${vivox_src_dir}
-    "${SHARED_LIB_STAGING_DIR_DEBUG}"
-    out_targets 
-    ${vivox_files}
-    )
-set(third_party_targets ${third_party_targets} ${out_targets})
-
-copy_if_different(
-    ${vivox_src_dir}
-    "${SHARED_LIB_STAGING_DIR_RELEASE}"
-    out_targets
-    ${vivox_files}
-    )
-set(third_party_targets ${third_party_targets} ${out_targets})
-
-copy_if_different(
-    ${vivox_src_dir}
-    "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
-    out_targets
-    ${vivox_files}
-    )
-set(third_party_targets ${third_party_targets} ${out_targets})
-
-
-
-copy_if_different(
-    ${debug_src_dir}
-    "${SHARED_LIB_STAGING_DIR_DEBUG}"
-    out_targets
-    ${debug_files}
-    )
-set(third_party_targets ${third_party_targets} ${out_targets})
-
-copy_if_different(
-    ${release_src_dir}
-    "${SHARED_LIB_STAGING_DIR_RELEASE}"
-    out_targets
-    ${release_files}
-    )
-set(third_party_targets ${third_party_targets} ${out_targets})
-
-copy_if_different(
-    ${release_src_dir}
-    "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
-    out_targets
-    ${release_files}
-    )
-set(third_party_targets ${third_party_targets} ${out_targets})
-
-if(NOT USESYSTEMLIBS)
-  add_custom_target(
-      stage_third_party_libs ALL
-      DEPENDS ${third_party_targets}
-      )
-endif(NOT USESYSTEMLIBS)
--- a/indra/cmake/CopyBackToSource.cmake
+++ b/indra/cmake/CopyBackToSource.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+# Copies a binary back to the source directory
+
+MACRO(COPY_BACK_TO_SOURCE target)
+   GET_TARGET_PROPERTY(FROM ${target} LOCATION)
+   SET(TO ${CMAKE_CURRENT_SOURCE_DIR})
+   #MESSAGE("TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${FROM} ${TO}")
+   ADD_CUSTOM_COMMAND(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy ${FROM} ${TO}
+        DEPENDS ${FROM}
+        COMMENT "Copying ${target} to ${CMAKE_CURRENT_BINARY_DIR}"
+        )
+ENDMACRO(COPY_BACK_TO_SOURCE)
+
+
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -0,0 +1,320 @@
+# -*- cmake -*-
+
+# The copy_win_libs folder contains file lists and a script used to 
+# copy dlls, exes and such needed to run the SecondLife from within 
+# VisualStudio. 
+
+include(CMakeCopyIfDifferent)
+
+if(WORD_SIZE EQUAL 32)
+    set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+    set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+else(WORD_SIZE EQUAL 32)
+    set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/debug")
+    set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/release")
+endif(WORD_SIZE EQUAL 32)
+
+set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
+set(vivox_files
+    ca-bundle.crt
+    libsndfile-1.dll
+    ortp.dll
+    SLVoice.exe
+    vivoxoal.dll
+    vivoxplatform.dll
+    vivoxsdk.dll
+    zlib1.dll
+    )
+copy_if_different(
+    ${vivox_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+    out_targets
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+
+set(debug_src_dir "${debug_libs_dir}")
+set(debug_files
+    libhunspell.dll
+    libapr-1.dll
+    libaprutil-1.dll
+    libapriconv-1.dll
+    libeay32.dll
+    ssleay32.dll
+    libcollada14dom22-d.dll
+    glod.dll
+    )
+
+copy_if_different(
+    ${debug_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+    out_targets 
+    ${debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Debug config runtime files required for the plugin test mule
+set(plugintest_debug_src_dir "${debug_libs_dir}")
+set(plugintest_debug_files
+    libeay32.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugintest_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
+    out_targets
+    ${plugintest_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Debug config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugintest_debug_src_dir "${debug_libs_dir}/imageformats")
+set(plugintest_debug_files
+    qgifd4.dll
+    qicod4.dll
+    qjpegd4.dll
+    qmngd4.dll
+    qsvgd4.dll
+    qtiffd4.dll
+    )
+copy_if_different(
+    ${plugintest_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
+    out_targets
+    ${plugintest_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
+    out_targets
+    ${plugintest_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Release & ReleaseDebInfo config runtime files required for the plugin test mule
+set(plugintest_release_src_dir "${release_libs_dir}")
+set(plugintest_release_files
+    libeay32.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugintest_release_src_dir "${release_libs_dir}/imageformats")
+set(plugintest_release_files
+    qgif4.dll
+    qico4.dll
+    qjpeg4.dll
+    qmng4.dll
+    qsvg4.dll
+    qtiff4.dll
+    )
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Debug config runtime files required for the plugins
+set(plugins_debug_src_dir "${debug_libs_dir}")
+set(plugins_debug_files
+    libeay32.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugins_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
+    out_targets
+    ${plugins_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Release & ReleaseDebInfo config runtime files required for the plugins
+set(plugins_release_src_dir "${release_libs_dir}")
+set(plugins_release_files
+    libeay32.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugins_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
+    out_targets
+    ${plugins_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugins_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
+    out_targets
+    ${plugins_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+
+set(release_src_dir "${release_libs_dir}")
+set(release_files
+    libhunspell.dll
+    libapr-1.dll
+    libaprutil-1.dll
+    libapriconv-1.dll
+    libeay32.dll
+    ssleay32.dll
+    libcollada14dom22.dll
+    glod.dll
+    )
+
+if(WORD_SIZE EQUAL 32)
+    set(release_files ${release_files}
+    libtcmalloc_minimal.dll
+    )
+endif(WORD_SIZE EQUAL 32)
+
+
+if(FMODEX)
+    if (WORD_SIZE EQUAL 32)
+        set(fmodex_dll_file "fmodex.dll")
+    else (WORD_SIZE EQUAL 32)
+        set(fmodex_dll_file "fmodex64.dll")
+    endif (WORD_SIZE EQUAL 32)
+    
+    find_path(FMODEX_BINARY_DIR "${fmodex_dll_file}"
+          "${release_src_dir}"
+          "${FMODEX_SDK_DIR}/api"
+          "${FMODEX_SDK_DIR}"
+          NO_DEFAULT_PATH
+          )
+
+    if(FMODEX_BINARY_DIR)
+        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets "${fmodex_dll_file}")
+        set(all_targets ${all_targets} ${out_targets})
+        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets "${fmodex_dll_file}")
+        set(all_targets ${all_targets} ${out_targets})
+        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets "${fmodex_dll_file}")
+        set(all_targets ${all_targets} ${out_targets})
+    endif(FMODEX_BINARY_DIR)
+endif(FMODEX)
+
+if(FMOD)
+    find_path(FMOD_BINARY_DIR fmod.dll
+          ${release_src_dir}
+          ${FMOD_SDK_DIR}/api
+          ${FMOD_SDK_DIR}
+          )
+
+if(FMOD_BINARY_DIR)
+    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll)
+    set(all_targets ${all_targets} ${out_targets})
+    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll)
+    set(all_targets ${all_targets} ${out_targets})
+    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll)
+    set(all_targets ${all_targets} ${out_targets})
+    else(FMOD_BINARY_DIR)
+        list(APPEND release_files fmod.dll)	#Required for compile. This will cause an error in copying binaries.
+    endif(FMOD_BINARY_DIR)
+endif(FMOD)
+    
+copy_if_different(
+    ${release_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release"
+    out_targets 
+    ${release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release"
+    out_targets 
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${release_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+    out_targets 
+    ${release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+    out_targets 
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+add_custom_target(copy_win_libs ALL
+  DEPENDS 
+    ${all_targets}
+    ${release_appconfig_file} 
+    ${relwithdebinfo_appconfig_file} 
+    ${debug_appconfig_file}
+  )
+add_dependencies(copy_win_libs prepare)
+
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -7,10 +7,10 @@ if (STANDALONE)
  pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)

 elseif (LINUX)
-  use_prebuilt_binary(dbus-glib)
+  use_prebuilt_binary(dbusglib)
  set(DBUSGLIB_FOUND ON FORCE BOOL)
  set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/dbus
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/dbus
      )
  # We don't need to explicitly link against dbus-glib itself, because
  # the viewer probes for the system's copy at runtime.
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
@@ -1,70 +0,0 @@
-# DeploySharedLibs.cmake
-# This is a script to be run at build time! Its not part of the cmake configuration!
-# See indra/cmake/LLSharedLibs.cmake for a macro that simplifies adding a command to a target to run this script.
-
-# This  script requires a few cmake variable to be set on the command line:
-# BIN_NAME= The full path the the binary to search for dependecies.
-# SEARCH_DIRS= The full paths to dirs to search for dependencies.
-# DST_PATH= The full path where the dependecies will be copied.
-get_filename_component(current_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
-include(GetPrerequisites)
-
-message("Getting recursive dependencies for file: ${BIN_NAME}")
-
-set(EXCLUDE_SYSTEM 1)
-set(RECURSE 0)
-get_filename_component(EXE_PATH ${BIN_NAME} PATH)
-
-get_prerequisites( ${BIN_NAME} RESULTS ${EXCLUDE_SYSTEM} ${RECURSE} "${EXE_PATH}" "${SEARCH_DIRS}" )
-
-foreach(DEP ${RESULTS})
-  Message("Processing dependency: ${DEP}")
-  get_filename_component(DEP_FILE ${DEP} NAME)
-  set(DEP_FILES ${DEP_FILES} ${DEP_FILE})
-endforeach(DEP)
-
-if(DEP_FILES)
-  list(REMOVE_DUPLICATES DEP_FILES)
-endif(DEP_FILES)
-
-foreach(DEP_FILE ${DEP_FILES})
-  if(FOUND_FILES)
-    list(FIND FOUND_FILES ${DEP_FILE} FOUND)
-  else(FOUND_FILES)
-    set(FOUND -1)
-  endif(FOUND_FILES)
-
-  if(FOUND EQUAL -1)
-    find_path(DEP_PATH ${DEP_FILE} PATHS ${SEARCH_DIRS} NO_DEFAULT_PATH)
-    if(DEP_PATH)
-      set(FOUND_FILES ${FOUND_FILES} "${DEP_PATH}/${DEP_FILE}")
-      set(DEP_PATH NOTFOUND) #reset DEP_PATH for the next find_path call.
-    else(DEP_PATH)
-      set(MISSING_FILES ${MISSING_FILES} ${DEP_FILE})
-    endif(DEP_PATH)
-  endif(FOUND EQUAL -1)
-endforeach(DEP_FILE)
-
-if(MISSING_FILES)
-  message("Missing:")
-  foreach(FILE ${MISSING_FILES})
-    message("  ${FILE}")
-  endforeach(FILE)
-  message("Searched in:")
-  foreach(SEARCH_DIR ${SEARCH_DIRS})
-    message("  ${SEARCH_DIR}")
-  endforeach(SEARCH_DIR)
-  message(FATAL_ERROR "Failed")
-endif(MISSING_FILES)
-
-if(FOUND_FILES)
-  foreach(FILE ${FOUND_FILES})
-    get_filename_component(DST_FILE ${FILE} NAME)
-    set(DST_FILE "${DST_PATH}/${DST_FILE}")
-    message("Copying ${FILE} to ${DST_FILE}")
-    execute_process(
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE} ${DST_FILE}
-      )
-  endforeach(FILE ${FOUND_FILES})
-endif(FOUND_FILES)
-message("Success!")
--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
@@ -0,0 +1,75 @@
+# -*- cmake -*-
+
+include(Variables)
+
+if (WINDOWS)
+  if (WORD_SIZE EQUAL 32)
+    set (DIRECTX_ARCHITECTURE x86)
+  elseif (WORD_SIZE EQUAL 64)
+    set (DIRECTX_ARCHITECTURE x64)
+  else (WORD_SIZE EQUAL 32)
+    set (DIRECTX_ARCHITECTURE x86)
+  endif (WORD_SIZE EQUAL 32)
+
+  find_path(DIRECTX_ROOT_DIR Include/dxdiag.h
+            PATHS
+            "$ENV{DXSDK_DIR}"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2010)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (February 2010)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (February 2010)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2009)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2009)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2008)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2008)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2008)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2008)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2008)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2008)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (November 2007)"
+            "$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)"
+            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2007)"
+            )
+
+  if (DIRECTX_ROOT_DIR)
+    set (DIRECTX_INCLUDE_DIR "${DIRECTX_ROOT_DIR}/Include")
+    set (DIRECTX_LIBRARY_DIR "${DIRECTX_ROOT_DIR}/Lib/${DIRECTX_ARCHITECTURE}")
+  else (DIRECTX_ROOT_DIR)
+    find_path (WIN_KIT_ROOT_DIR Include/um/windows.h
+               PATHS
+               "$ENV{ProgramFiles}/Windows Kits/8.1"
+               "$ENV{ProgramFiles(x86)}/Windows Kits/8.1"
+               "$ENV{ProgramFiles}/Windows Kits/8.0"
+               "$ENV{ProgramFiles(x86)}/Windows Kits/8.0"
+               )
+
+    find_path (WIN_KIT_LIB_DIR dxguid.lib
+               "${WIN_KIT_ROOT_DIR}/Lib/winv6.3/um/${DIRECTX_ARCHITECTURE}"
+               "${WIN_KIT_ROOT_DIR}/Lib/Win8/um/${DIRECTX_ARCHITECTURE}"
+               )
+
+    if (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR)
+      set (DIRECTX_INCLUDE_DIR "${WIN_KIT_ROOT_DIR}/Include/um" "${WIN_KIT_ROOT_DIR}/Include/shared")
+      set (DIRECTX_LIBRARY_DIR "${WIN_KIT_LIB_DIR}")
+    endif (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR)
+  endif (DIRECTX_ROOT_DIR)
+
+  if (DIRECTX_INCLUDE_DIR)
+    include_directories(${DIRECTX_INCLUDE_DIR})
+    if (DIRECTX_FIND_QUIETLY)
+      message(STATUS "Found DirectX include: ${DIRECTX_INCLUDE_DIR}")
+    endif (DIRECTX_FIND_QUIETLY)
+  else (DIRECTX_INCLUDE_DIR)
+    message(FATAL_ERROR "Could not find DirectX SDK Include")
+  endif (DIRECTX_INCLUDE_DIR)
+
+  if (DIRECTX_LIBRARY_DIR)
+    if (DIRECTX_FIND_QUIETLY)
+      message(STATUS "Found DirectX include: ${DIRECTX_LIBRARY_DIR}")
+    endif (DIRECTX_FIND_QUIETLY)
+  else (DIRECTX_LIBRARY_DIR)
+    message(FATAL_ERROR "Could not find DirectX SDK Libraries")
+  endif (DIRECTX_LIBRARY_DIR)
+
+endif (WINDOWS)
--- a/indra/cmake/DownloadPrebuilt.cmake.in
+++ b/indra/cmake/DownloadPrebuilt.cmake.in
@@ -0,0 +1,45 @@
+# This script drives download of prebuilt packages during the build.
+# The top-level CMakeLists.txt configures packages and tool locations.
+set(packages "@PREBUILT_PACKAGES@")
+set(python "@PYTHON_EXECUTABLE@")
+set(install_dir "@CMAKE_SOURCE_DIR@/..")
+set(scp "@SCP_EXECUTABLE@")
+set(scripts_dir "@SCRIPTS_DIR@")
+set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare")
+set(prebuilt_type "@PREBUILT_TYPE@")
+
+# In proprietary mode we use scp for download.
+set(proprietary "@INSTALL_PROPRIETARY@")
+if(proprietary)
+  set(scp_option "--scp=${scp}")
+  set(proprietary_message " proprietary")
+endif(proprietary)
+
+foreach(package ${packages})
+  if(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
+    # This package is missing or out of date.
+    message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'")
+    execute_process(
+      COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} ${scp_option} ${package}
+      WORKING_DIRECTORY ${scripts_dir}
+      RESULT_VARIABLE result
+      )
+    if(result STREQUAL 0)
+      # Write a sentinel to avoid attempting a download again.
+      file(WRITE ${sentinel_dir}/${package}_installed "Obtained '${package}'")
+    else(result STREQUAL 0)
+      # Remove the sentinel to ensure a download is attempted again.
+      file(REMOVE ${sentinel_dir}/prebuilt
+                  ${sentinel_dir}/${package}_installed)
+      message(FATAL_ERROR
+        "Failed to download or unpack prebuilt '${package}'.  "
+        "Process returned: ${result}")
+    endif(result STREQUAL 0)
+  else(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
+    # This package is ready.
+    message(STATUS "Prebuilt '${package}' is up-to-date")
+  endif(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
+endforeach(package)
+
+# Store a sentinel to avoid running this script unnecessarily.
+file(WRITE ${sentinel_dir}/prebuilt "All prebuilts obtained successfully\n")
--- a/indra/cmake/ELFIO.cmake
+++ b/indra/cmake/ELFIO.cmake
@@ -0,0 +1,19 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(ELFIO_FIND_QUIETLY ON)
+
+if (STANDALONE)
+  include(FindELFIO)
+elseif (LINUX)
+  use_prebuilt_binary(elfio)
+  set(ELFIO_LIBRARIES ELFIO)
+  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(ELFIO_FOUND "YES")
+endif (STANDALONE)
+
+if (ELFIO_FOUND)
+  add_definitions(-DLL_ELFBIN=1)
+else (ELFIO_FOUND)
+  set(ELFIO_INCLUDE_DIR "")
+endif (ELFIO_FOUND)
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -9,9 +9,9 @@ if (STANDALONE)
 else (STANDALONE)
    use_prebuilt_binary(expat)
    if (WINDOWS)
-        set(EXPAT_LIBRARIES expat)
+        set(EXPAT_LIBRARIES libexpatMT)
    else (WINDOWS)
        set(EXPAT_LIBRARIES expat)
    endif (WINDOWS)
-    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -0,0 +1,52 @@
+# -*- cmake -*-
+
+include(Linking)
+
+if(INSTALL_PROPRIETARY)
+  include(Prebuilt)
+  use_prebuilt_binary(fmod)
+endif(INSTALL_PROPRIETARY)
+
+find_library(FMOD_LIBRARY
+             NAMES fmod fmodvc fmod-3.75
+             PATHS
+             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
+             debug ${ARCH_PREBUILT_DIRS_DEBUG}
+             )
+
+if (NOT FMOD_LIBRARY)
+  set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.")
+  if (FMOD_SDK_DIR)
+    find_library(FMOD_LIBRARY
+                 NAMES fmodvc fmod-3.75 fmod
+                 PATHS
+                 ${FMOD_SDK_DIR}/api/lib
+                 ${FMOD_SDK_DIR}/api
+                 ${FMOD_SDK_DIR}/lib
+                 ${FMOD_SDK_DIR}
+                 )
+  endif (FMOD_SDK_DIR)
+endif (NOT FMOD_LIBRARY)
+
+find_path(FMOD_INCLUDE_DIR fmod.h
+          ${LIBS_PREBUILT_DIR}/include
+          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+          ${FMOD_SDK_DIR}/api/inc
+          ${FMOD_SDK_DIR}/inc
+          ${FMOD_SDK_DIR}
+          )
+
+if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+  set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.")
+else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+  set(FMOD_LIBRARY "")
+  set(FMOD_INCLUDE_DIR "")
+  if (FMOD)
+    message(STATUS "No support for FMOD audio (need to set FMOD_SDK_DIR?)")
+  endif (FMOD)
+  set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.")
+endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+
+if (FMOD)
+  message(STATUS "Building with FMOD audio support")
+endif (FMOD)
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -0,0 +1,82 @@
+# -*- cmake -*-
+
+include(Linking)
+
+if (NOT FMODEX_LIBRARY)
+  set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
+  if (FMODEX_SDK_DIR)
+    if(WORD_SIZE EQUAL 32)
+      find_library(FMODEX_LIBRARY
+                   fmodex_vc fmodexL_vc fmodex fmodexL
+                   PATHS
+                   "${FMODEX_SDK_DIR}/api/lib"
+                   "${FMODEX_SDK_DIR}/api"
+                   "${FMODEX_SDK_DIR}/lib"
+                   "${FMODEX_SDK_DIR}"
+                   )
+    elseif(WORD_SIZE EQUAL 64)
+      find_library(FMODEX_LIBRARY
+                   fmodex64_vc fmodexL64_vc fmodex64 fmodexL64
+                   PATHS
+                   "${FMODEX_SDK_DIR}/api/lib"
+                   "${FMODEX_SDK_DIR}/api"
+                   "${FMODEX_SDK_DIR}/lib"
+                   "${FMODEX_SDK_DIR}"
+                   )
+    endif(WORD_SIZE EQUAL 32)
+  endif(FMODEX_SDK_DIR)
+  if(WINDOWS AND NOT FMODEX_SDK_DIR)
+    GET_FILENAME_COMPONENT(FMODEX_PROG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Programmers\ API\ Windows] ABSOLUTE CACHE)
+    if(WORD_SIZE EQUAL 32)
+      find_library(FMODEX_LIBRARY
+                   fmodex_vc fmodexL_vc
+                   PATHS
+                   "${FMODEX_PROG_DIR}/api/lib"
+                   "${FMODEX_PROG_DIR}/api"
+                   "${FMODEX_PROG_DIR}"
+                   )
+    else(WORD_SIZE EQUAL 32)
+      find_library(FMODEX_LIBRARY
+                   fmodex64_vc fmodexL64_vc
+                   PATHS
+                   "${FMODEX_PROG_DIR}/api/lib"
+                   "${FMODEX_PROG_DIR}/api"
+                   "${FMODEX_PROG_DIR}"
+                   )
+    endif(WORD_SIZE EQUAL 32)
+    if(FMODEX_LIBRARY)
+      message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
+      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}")
+      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}" CACHE PATH "Path to the FMOD Ex SDK." FORCE)
+    endif(FMODEX_LIBRARY)
+  endif(WINDOWS AND NOT FMODEX_SDK_DIR)
+endif (NOT FMODEX_LIBRARY)
+
+find_path(FMODEX_INCLUDE_DIR fmod.hpp
+          "${LIBS_PREBUILT_DIR}/include/fmodex"
+          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex"
+          "${FMODEX_SDK_DIR}/api/inc"
+          "${FMODEX_SDK_DIR}/inc"
+          "${FMODEX_SDK_DIR}"
+          )
+
+if(DARWIN)
+  set(FMODEX_ORIG_LIBRARY "${FMODEX_LIBRARY}")
+  set(FMODEX_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/libfmodex.dylib")
+endif(DARWIN)
+
+if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
+  set(FMODEX ON CACHE BOOL "Use closed source FMOD Ex sound library.")
+else (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
+  set(FMODEX_LIBRARY "")
+  set(FMODEX_INCLUDE_DIR "")
+  if (FMODEX)
+    message(STATUS "No support for FMOD Ex audio (need to set FMODEX_SDK_DIR?)")
+  endif (FMODEX)
+  set(FMODEX OFF CACHE BOOL "Use closed source FMOD Ex sound library.")
+  set(FMODEX OFF)
+endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
+
+if (FMODEX)
+  message(STATUS "Building with FMOD Ex audio support")
+endif (FMODEX)
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -1,56 +0,0 @@
-# -*- cmake -*-
-
-include(Variables)
-if (FMODSTUDIO)
-  use_prebuilt_binary(fmodstudio)
-  if(WINDOWS)
-    set(lib_suffix .dll)
-  elseif(DARWIN)
-    set(lib_suffix .dylib)
-  else(WINDOWS)
-    set(lib_suffix .so)
-  endif(WINDOWS)
-  if(WINDOWS)
-    if(WORD_SIZE EQUAL 64) 
-      set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/fmod64${lib_suffix})
-      set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/fmodL64${lib_suffix})
-    else(WORD_SIZE EQUAL 64)
-      set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/fmod${lib_suffix})
-      set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/fmodL${lib_suffix})
-    endif(WORD_SIZE EQUAL 64)
-  else(WINDOWS)
-    set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/libfmod${lib_suffix})
-    set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/libfmodL${lib_suffix})
-  endif(WINDOWS)
-  set(FMOD_LINK_LIBRARY_RELEASE ${FMOD_LIBRARY_RELEASE})
-  set(FMOD_LINK_LIBRARY_DEBUG ${FMOD_LIBRARY_DEBUG})
-
-  if(WINDOWS)
-    string(REPLACE ".dll" "_vc.lib" FMOD_LINK_LIBRARY_RELEASE ${FMOD_LIBRARY_RELEASE})
-    string(REPLACE ".dll" "_vc.lib" FMOD_LINK_LIBRARY_DEBUG ${FMOD_LIBRARY_DEBUG})
-  endif(WINDOWS)
-
-  set (FMOD_LIBRARY
-    debug ${FMOD_LINK_LIBRARY_DEBUG}
-    optimized ${FMOD_LINK_LIBRARY_RELEASE}
-    )
-
-  set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
-endif(FMODSTUDIO)
-
-if(FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
-  set(FMOD ON)
-  if (NOT FMOD_LIBRARY_DEBUG) #Use release library in debug configuration if debug library is absent.
-    set(FMOD_LIBRARY_DEBUG ${FMOD_LIBRARY_RELEASE})
-  endif (NOT FMOD_LIBRARY_DEBUG)
-else (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
-  message(STATUS "No support for FMOD Studio audio (need to set FMODSTUDIO_SDK_DIR?)")
-  set(FMOD OFF)
-  set(FMODSTUDIO OFF)
-endif (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
-
-if (FMOD)
-  message(STATUS "Building with FMOD Studio audio support")
-  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODSTUDIO=1")
-endif (FMOD)
-
--- a/indra/cmake/FindAutobuild.cmake
+++ b/indra/cmake/FindAutobuild.cmake
@@ -1,43 +0,0 @@
-# -*- cmake -*-
-#
-# Find the autobuild tool
-#
-# Output variables:
-#
-#   AUTOBUILD_EXECUTABLE - path to autobuild executable
-
-
-
-IF (NOT AUTOBUILD_EXECUTABLE)
-
-  # If cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
-  IF (DEFINED ENV{AUTOBUILD})
-    SET(AUTOBUILD_EXECUTABLE $ENV{AUTOBUILD})
-  ELSE (DEFINED ENV{AUTOBUILD})
-    IF(WIN32)
-      SET(AUTOBUILD_EXE_NAMES autobuild.exe autobuild.cmd)
-    ELSE(WIN32)
-      SET(AUTOBUILD_EXE_NAMES autobuild)
-    ENDIF(WIN32)
-
-    SET(AUTOBUILD_EXECUTABLE)
-    FIND_PROGRAM(
-      AUTOBUILD_EXECUTABLE 
-      NAMES ${AUTOBUILD_EXE_NAMES}
-      PATHS 
-        ENV PATH
-        ${CMAKE_SOURCE_DIR}/.. 
-        ${CMAKE_SOURCE_DIR}/../..
-        ${CMAKE_SOURCE_DIR}/../../..
-      PATH_SUFFIXES "/autobuild/bin/"
-    )
-  ENDIF (DEFINED ENV{AUTOBUILD})
-
-  IF (NOT AUTOBUILD_EXECUTABLE)
-    IF (AUTOBUILD_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find autobuild executable")
-    ENDIF (AUTOBUILD_FIND_REQUIRED)
-  ENDIF (NOT AUTOBUILD_EXECUTABLE)
-
-  MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE)
-ENDIF (NOT AUTOBUILD_EXECUTABLE)
--- a/indra/cmake/FindBerkeleyDB.cmake
+++ b/indra/cmake/FindBerkeleyDB.cmake
@@ -0,0 +1,50 @@
+# -*- cmake -*-
+
+# - Find BerkeleyDB
+# Find the BerkeleyDB includes and library
+# This module defines
+#  DB_INCLUDE_DIR, where to find db.h, etc.
+#  DB_LIBRARIES, the libraries needed to use BerkeleyDB.
+#  DB_FOUND, If false, do not try to use BerkeleyDB.
+# also defined, but not for general use are
+#  DB_LIBRARY, where to find the BerkeleyDB library.
+
+FIND_PATH(DB_INCLUDE_DIR db.h
+/usr/local/include/db4
+/usr/local/include
+/usr/include/db4
+/usr/include
+)
+
+SET(DB_NAMES ${DB_NAMES} db)
+FIND_LIBRARY(DB_LIBRARY
+  NAMES ${DB_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (DB_LIBRARY AND DB_INCLUDE_DIR)
+    SET(DB_LIBRARIES ${DB_LIBRARY})
+    SET(DB_FOUND "YES")
+ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
+  SET(DB_FOUND "NO")
+ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
+
+
+IF (DB_FOUND)
+   IF (NOT DB_FIND_QUIETLY)
+      MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}")
+   ENDIF (NOT DB_FIND_QUIETLY)
+ELSE (DB_FOUND)
+   IF (DB_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library")
+   ENDIF (DB_FIND_REQUIRED)
+ENDIF (DB_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  DB_LIBRARY
+  DB_INCLUDE_DIR
+  )
--- a/indra/cmake/FindELFIO.cmake
+++ b/indra/cmake/FindELFIO.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+# - Find ELFIO
+# Find the ELFIO includes and library
+# This module defines
+#  ELFIO_INCLUDE_DIR, where to find elfio.h, etc.
+#  ELFIO_LIBRARIES, the libraries needed to use ELFIO.
+#  ELFIO_FOUND, If false, do not try to use ELFIO.
+# also defined, but not for general use are
+#  ELFIO_LIBRARY, where to find the ELFIO library.
+
+FIND_PATH(ELFIO_INCLUDE_DIR ELFIO/ELFIO.h
+/usr/local/include
+/usr/include
+)
+
+SET(ELFIO_NAMES ${ELFIO_NAMES} ELFIO)
+FIND_LIBRARY(ELFIO_LIBRARY
+  NAMES ${ELFIO_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
+    SET(ELFIO_LIBRARIES ${ELFIO_LIBRARY})
+    SET(ELFIO_FOUND "YES")
+ELSE (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
+  SET(ELFIO_FOUND "NO")
+ENDIF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
+
+
+IF (ELFIO_FOUND)
+   IF (NOT ELFIO_FIND_QUIETLY)
+      MESSAGE(STATUS "Found ELFIO: ${ELFIO_LIBRARIES}")
+   ENDIF (NOT ELFIO_FIND_QUIETLY)
+ELSE (ELFIO_FOUND)
+   IF (ELFIO_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find ELFIO library")
+   ENDIF (ELFIO_FIND_REQUIRED)
+ENDIF (ELFIO_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_ELFIO_INCLUDE_PATH ${ELFIO_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_ELFIO_LIB_PATH ${ELFIO_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  ELFIO_LIBRARY
+  ELFIO_INCLUDE_DIR
+  )
--- a/indra/cmake/FindLLQtWebkit.cmake
+++ b/indra/cmake/FindLLQtWebkit.cmake
@@ -0,0 +1,62 @@
+# -*- cmake -*-
+
+# - Find llqtwebkit
+# Find the llqtwebkit includes and library
+# This module defines
+#  LLQTWEBKIT_INCLUDE_DIR, where to find llqtwebkit.h, etc.
+#  LLQTWEBKIT_LIBRARY, the llqtwebkit library with full path.
+#  LLQTWEBKIT_FOUND, If false, do not try to use llqtwebkit.
+# also defined, but not for general use are
+#  LLQTWEBKIT_LIBRARIES, the libraries needed to use llqtwebkit.
+#  LLQTWEBKIT_LIBRARY_DIRS, where to find the llqtwebkit library.
+#  LLQTWEBKIT_DEFINITIONS - You should add_definitions(${LLQTWEBKIT_DEFINITIONS})
+#      before compiling code that includes llqtwebkit library files.
+
+# Try to use pkg-config first.
+# This allows to have two different libllqtwebkit packages installed:
+# one for viewer 2.x and one for viewer 1.x.
+include(FindPkgConfig)
+if (PKG_CONFIG_FOUND)
+    if (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
+        set(_PACKAGE_ARGS libllqtwebkit>=${LLQtWebkit_FIND_VERSION} REQUIRED)
+    else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
+        set(_PACKAGE_ARGS libllqtwebkit)
+    endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
+    if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8")
+      # As virtually nobody will have a pkg-config file for this, do this check always quiet.
+      # Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'.
+      set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET)
+    endif ()
+    pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS})
+endif (PKG_CONFIG_FOUND)
+set(LLQTWEBKIT_DEFINITIONS ${LLQTWEBKIT_CFLAGS_OTHER})
+
+find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_INCLUDE_DIRS})
+
+find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS})
+
+if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)   # If pkg-config couldn't find it, pretend we don't have pkg-config.
+   set(LLQTWEBKIT_LIBRARIES llqtwebkit)
+   get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
+endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)
+
+# Handle the QUIETLY and REQUIRED arguments and set LLQTWEBKIT_FOUND
+# to TRUE if all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  LLQTWEBKIT
+  DEFAULT_MSG
+  LLQTWEBKIT_LIBRARY
+  LLQTWEBKIT_INCLUDE_DIR
+  LLQTWEBKIT_LIBRARIES
+  LLQTWEBKIT_LIBRARY_DIRS
+  )
+
+mark_as_advanced(
+  LLQTWEBKIT_LIBRARY
+  LLQTWEBKIT_INCLUDE_DIR
+  LLQTWEBKIT_LIBRARIES
+  LLQTWEBKIT_LIBRARY_DIRS
+  LLQTWEBKIT_DEFINITIONS
+  )
+
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -7,7 +7,13 @@ if (STANDALONE)
  pkg_check_modules(FREETYPE REQUIRED freetype2)
 else (STANDALONE)
  use_prebuilt_binary(freetype)
-  set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2)
+  if (LINUX)
+    set(FREETYPE_INCLUDE_DIRS
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  else (LINUX)
+    set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  endif (LINUX)
+
  set(FREETYPE_LIBRARIES freetype)
 endif (STANDALONE)

--- a/indra/cmake/GLOD.cmake
+++ b/indra/cmake/GLOD.cmake
@@ -7,8 +7,7 @@ set(GLOD_FIND_REQUIRED ON)
 if (STANDALONE)
  include(FindGLOD)
 else (STANDALONE)
-  use_prebuilt_binary(glod)
-
-  set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glod)
-  set(GLOD_LIBRARIES GLOD)
+  use_prebuilt_binary(GLOD)
+  set(GLOD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLOD_LIBRARIES glod)
 endif (STANDALONE)
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -1,9 +1,27 @@
 # -*- cmake -*-
 include(Prebuilt)
+
+if (STANDALONE)
  include(FindPkgConfig)
+
  pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
  pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)

+else (STANDALONE)
+
+  # Possibly libxml and glib should have their own .cmake file instead...
+  use_prebuilt_binary(glib)			# gstreamer needs glib
+  use_prebuilt_binary(libxml)
+  use_prebuilt_binary(gstreamer)
+  set(GSTREAMER010_FOUND ON FORCE BOOL)
+  set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
+  set(GSTREAMER010_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+      )
+
+endif (STANDALONE)

 if (WINDOWS)
  # We don't need to explicitly link against gstreamer itself, because
--- a/indra/cmake/GoogleBreakpad.cmake
+++ b/indra/cmake/GoogleBreakpad.cmake
@@ -17,10 +17,5 @@ else (STANDALONE)
  endif (WINDOWS)
  # yes, this does look dumb, no, it's not incorrect
  # I think it's incorrect: the second one should go --Aleric
-  set(BREAKPAD_INCLUDE_DIRECTORIES
-    ${LIBS_PREBUILT_DIR}/include/google_breakpad
-    ${LIBS_PREBUILT_LEGACY_DIR}/include/google_breakpad
-    ${LIBS_PREBUILT_DIR}/include/google_breakpad/google_breakpad
-    ${LIBS_PREBUILT_LEGACY_DIR}/include/google_breakpad/google_breakpad
-    )
+  set(BREAKPAD_INCLUDE_DIRECTORIES "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/google_breakpad" "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/google_breakpad/google_breakpad")
 endif (STANDALONE)
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -25,9 +25,7 @@ else (STANDALONE)
      set(TCMALLOC_LIBRARIES tcmalloc_minimal)
    endif()
    set(GOOGLE_PERFTOOLS_INCLUDE_DIR
-      ${LIBS_PREBUILT_DIR}/include
-      ${LIBS_PREBUILT_LEGACY_DIR}/include
-      )
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
  endif (LINUX)
 endif (STANDALONE)

--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -4,12 +4,13 @@ include(Prebuilt)
 if (STANDALONE)
 	include(FindHunSpell)
 else (STANDALONE)
-  use_prebuilt_binary(libhunspell)
+    use_prebuilt_binary(hunspell)
+	
+	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell)

-  if (LINUX OR DARWIN)
-    set(HUNSPELL_LIBRARY hunspell-1.3)
-  else (LINUX OR DARWIN)
-    set(HUNSPELL_LIBRARY libhunspell)
-  endif (LINUX OR DARWIN)
-  set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+	if (LINUX OR DARWIN)
+	    set(HUNSPELL_LIBRARY hunspell-1.3)
+	else (LINUX OR DARWIN)
+	    set(HUNSPELL_LIBRARY libhunspell)
+	endif (LINUX OR DARWIN)
 endif (STANDALONE)
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -13,11 +13,11 @@ else (STANDALONE)
    set(JPEG_LIBRARIES jpeg)
  elseif (DARWIN)
    set(JPEG_LIBRARIES
-      debug libjpeg.a
-      optimized libjpeg.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libjpeg.a
      )
  elseif (WINDOWS)
    set(JPEG_LIBRARIES jpeglib)
  endif (LINUX)
-  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -10,13 +10,13 @@ if (STANDALONE)
 else (STANDALONE)
  use_prebuilt_binary(jsoncpp)
  if (WINDOWS)
-    set(JSONCPP_LIBRARIES
-      debug jsoncppd.lib
-      optimized jsoncpp.lib)
+    set(JSONCPP_LIBRARIES 
+      debug json_vc${MSVC_SUFFIX}d
+      optimized json_vc${MSVC_SUFFIX})
  elseif (DARWIN)
    set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
  elseif (LINUX)
    set(JSONCPP_LIBRARIES jsoncpp)
  endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/)
+  set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp)
 endif (STANDALONE)
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -87,7 +87,7 @@ MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
        ${libraries}
        )

-	SET(TEST_EXE $<TARGET_FILE:${name}_test>)
+    GET_TARGET_PROPERTY(TEST_EXE ${name}_test LOCATION)
    SET(TEST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}_test_ok.txt)

    IF ("${wrapper}" STREQUAL "")
--- a/indra/cmake/LLAudio.cmake
+++ b/indra/cmake/LLAudio.cmake
@@ -1,7 +1,6 @@
 # -*- cmake -*-

 include(Audio)
-include(OPENAL)

 set(LLAUDIO_INCLUDE_DIRS
    ${LIBS_OPEN_DIR}/llaudio
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -28,7 +28,7 @@ else (LINUX)
    set(LLCOMMON_LIBRARIES llcommon)
 endif (LINUX)

-set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.")
+set(LLCOMMON_LINK_SHARED ON CACHE BOOL "Build the llcommon target as a shared library.")
 if(LLCOMMON_LINK_SHARED)
  add_definitions(-DLL_COMMON_LINK_SHARED=1)
 endif(LLCOMMON_LINK_SHARED)
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -1,32 +1,22 @@
 # -*- cmake -*-

-# these should be moved to their own cmake file
-include(Prebuilt)
-include(Boost)
 include(Colladadom)

-
-use_prebuilt_binary(libxml2)
-
 set(LLPRIMITIVE_INCLUDE_DIRS
  ${LIBS_OPEN_DIR}/llprimitive
  ${COLLADADOM_INCLUDE_DIRS}
  )

 if (WINDOWS)
-    set(LLPRIMITIVE_LIBRARIES
-        llprimitive
-        ${COLLADADOM_LIBRARIES}
-        libxml2_a
-        ${BOOST_SYSTEM_LIBRARIES}
-        )
+  set(LLPRIMITIVE_LIBRARIES 
+	  debug llprimitive
+	  optimized llprimitive
+	  ${COLLADADOM_LIBRARIES}
+	  )
 else (WINDOWS)
-    set(LLPRIMITIVE_LIBRARIES 
-        llprimitive
-        ${COLLADADOM_LIBRARIES}
-        ${BOOST_SYSTEM_LIBRARIES}
-        minizip
-        xml2
-        )
+  set(LLPRIMITIVE_LIBRARIES 
+	  llprimitive
+	  ${COLLADADOM_LIBRARIES}
+	  )
 endif (WINDOWS)

--- a/indra/cmake/LLQtWebkit.cmake
+++ b/indra/cmake/LLQtWebkit.cmake
@@ -0,0 +1,11 @@
+# -*- cmake -*-
+
+if (STANDALONE)
+  set(LLQTWEBKIT_INCLUDE_DIR
+      ${LIBS_OPEN_DIR}/llqtwebkit
+      )
+
+  set(LLQTWEBKIT_LIBRARY
+      llqtwebkit
+      )
+endif (STANDALONE)
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -1,12 +1,17 @@
 # ll_deploy_sharedlibs_command
 # target_exe: the cmake target of the executable for which the shared libs will be deployed.
 macro(ll_deploy_sharedlibs_command target_exe) 
-  set(OUTPUT_PATH $<TARGET_FILE_DIR:${target_exe}>) 
-
+  get_target_property(TARGET_LOCATION ${target_exe} LOCATION)
+  get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH)
+  
  if(DARWIN)
    SET_TEST_PATH(SEARCH_DIRS)
    get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE)
    if(IS_BUNDLE)
+      # If its a bundle the exe is not in the target location, this should find it.
+      get_filename_component(TARGET_FILE ${TARGET_LOCATION} NAME)
+      set(OUTPUT_PATH ${TARGET_LOCATION}.app/Contents/MacOS)
+      set(TARGET_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
      set(OUTPUT_PATH ${OUTPUT_PATH}/../Resources)
    endif(IS_BUNDLE)
  elseif(WINDOWS)
@@ -21,7 +26,7 @@ macro(ll_deploy_sharedlibs_command target_exe)
    TARGET ${target_exe} POST_BUILD
    COMMAND ${CMAKE_COMMAND} 
    ARGS
-    "-DBIN_NAME=\"$<TARGET_FILE:${target_exe}>\""
+    "-DBIN_NAME=\"${TARGET_LOCATION}\""
    "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
    "-DDST_PATH=\"${OUTPUT_PATH}\""
    "-P"
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -14,10 +14,15 @@ if (STANDALONE)
      )
 else (STANDALONE)
  if (LINUX)
+    use_prebuilt_binary(mesa)
    use_prebuilt_binary(SDL)
    set (SDL_FOUND TRUE)
-    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-    set (SDL_LIBRARY SDL)
+    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
+    if(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL)
+    else(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL directfb fusion direct)
+    endif(WORD_SIZE EQUAL 64)
  endif (LINUX)
 endif (STANDALONE)

--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -1,50 +1,33 @@
 # -*- cmake -*-
-
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")

 include(Variables)

-set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
-set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins)
-set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
-set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
-if (WINDOWS)
-  set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
-  set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
-elseif (LINUX)
-  set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib)
-  set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin)
-elseif (DARWIN)
-  set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
-  set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs")
-endif (WINDOWS)
+if (NOT STANDALONE)
+  set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+  set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
+  set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)

-# Autobuild packages must provide 'release' versions of libraries, but may provide versions for
-# specific build types.  AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
-# the 'release' directory (as a default fallback).
-# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and
-# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux).  The reason for this is
-# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and
-# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators
-if(WINDOWS OR DARWIN)
-  # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
-  # fortunately both windows and darwin are case insensitive filesystems so this works.
-  set(AUTOBUILD_LIBS_INSTALL_DIRS "${AUTOBUILD_INSTALL_DIR}/lib/")
-else(WINDOWS OR DARWIN)
-  # else block is for linux and any other makefile based generators
-  string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-  set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER})
-endif(WINDOWS OR DARWIN)
+  if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
+    # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
+    # fortunately both windows and darwin are case insensitive filesystems so this works.
+    set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}")
+  else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
+    # else block is for linux and any other makefile based generators
+    string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+    set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER})
+  endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")

-if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-  # When we're building something other than Release, append the
-  # packages/lib/release directory to deal with autobuild packages that don't
-  # provide (e.g.) lib/debug libraries.
-  list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
-endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+  if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+    # When we're building something other than Release, append the
+    # packages/lib/release directory to deal with autobuild packages that don't
+    # provide (e.g.) lib/debug libraries.
+    list(APPEND ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
+  endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+endif (NOT STANDALONE)

-link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
+link_directories(${ARCH_PREBUILT_LINK_DIRS})

 if (LINUX)
  set(DL_LIBRARY dl)
@@ -58,7 +41,6 @@ if (WINDOWS)
  set(WINDOWS_LIBRARIES
      advapi32
      shell32
-      ole32
      ws2_32
      mswsock
      psapi
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -7,11 +7,7 @@ if (STANDALONE)
    message(STATUS "Building without N-DoF joystick support")
  endif(NOT NDOF_FOUND)
 else (STANDALONE)
-  if (WINDOWS OR DARWIN)
-    use_prebuilt_binary(libndofdev)
-  elseif (LINUX)
-    use_prebuilt_binary(libndofdev-open)
-  endif (WINDOWS OR DARWIN)
+  use_prebuilt_binary(ndofdev)

  if (WINDOWS)
    set(NDOF_LIBRARY libndofdev)
@@ -19,11 +15,7 @@ else (STANDALONE)
    set(NDOF_LIBRARY ndofdev)
  endif (WINDOWS)

-	if (WINDOWS)
-      set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-	else (WINDOWS)
-      set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/ndofdev)
-	endif (WINDOWS)
+  set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ndofdev)
  set(NDOF_FOUND 1)
 endif (STANDALONE)

@@ -31,8 +23,6 @@ if (NDOF_FOUND)
  add_definitions(-DLIB_NDOF=1)
  include_directories(${NDOF_INCLUDE_DIR})
 else (NDOF_FOUND)
-  message(STATUS "Building without N-DoF joystick support")
  set(NDOF_INCLUDE_DIR "")
  set(NDOF_LIBRARY "")
 endif (NDOF_FOUND)
-
--- a/indra/cmake/NVAPI.cmake
+++ b/indra/cmake/NVAPI.cmake
@@ -2,6 +2,8 @@
 include(Prebuilt)
 include(Variables)

+set(NVAPI ON CACHE BOOL "Use NVAPI.")
+
 if (NVAPI)
  if (WINDOWS)
    use_prebuilt_binary(nvapi)
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -2,7 +2,6 @@
 include(Linking)
 include(Prebuilt)

-if(NOT FMOD)
 if (LINUX)
  set(OPENAL ON CACHE BOOL "Enable OpenAL")
 else (LINUX)
@@ -16,17 +15,15 @@ if (OPENAL)
    pkg_check_modules(OPENAL_LIB REQUIRED openal)
    pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
  else (STANDALONE)
-    use_prebuilt_binary(openal)
+    use_prebuilt_binary(openal-soft)
  endif (STANDALONE)
  set(OPENAL_LIBRARIES 
    openal
    alut
    )
-    set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+    set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (OPENAL)

 if (OPENAL)
  message(STATUS "Building with OpenAL audio support")
-  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_OPENAL")
 endif (OPENAL)
-endif(NOT FMOD)
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -3,8 +3,5 @@ include(Prebuilt)

 if (NOT (STANDALONE OR DARWIN))
  use_prebuilt_binary(glext)
-  set(GLEXT_INCLUDE_DIR
-    ${LIBS_PREBUILT_DIR}/include
-    ${LIBS_PREBUILT_LEGACY_DIR}/include
-    )
+  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (NOT (STANDALONE OR DARWIN))
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -7,17 +7,15 @@ set(OpenSSL_FIND_REQUIRED ON)
 if (STANDALONE OR USE_SYSTEM_OPENSSL)
  include(FindOpenSSL)
 else (STANDALONE OR USE_SYSTEM_OPENSSL)
-  use_prebuilt_binary(openssl)
+  use_prebuilt_binary(openSSL)
  if (WINDOWS)
    set(OPENSSL_LIBRARIES ssleay32 libeay32)
  else (WINDOWS)
    set(OPENSSL_LIBRARIES ssl)
  endif (WINDOWS)
-  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE OR USE_SYSTEM_OPENSSL)

-if (LINUX)
-  set(CRYPTO_LIBRARIES crypto dl)
-elseif (DARWIN)
+if (LINUX OR DARWIN)
  set(CRYPTO_LIBRARIES crypto)
-endif (LINUX)
+endif (LINUX OR DARWIN)
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -9,28 +9,11 @@ if (STANDALONE)
 else (STANDALONE)
  use_prebuilt_binary(libpng)
  if (WINDOWS)
-    set(PNG_LIBRARIES libpng16)
+    set(PNG_LIBRARIES libpng15)
  elseif(DARWIN)
    set(PNG_LIBRARIES png15)
  else(LINUX)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 4) # Singu TODO: update png
-      set(PNG_LIBRARIES png15)
-    else ()
-      #
-      # When we have updated static libraries in competition with older
-      # shared libraries and we want the former to win, we need to do some
-      # extra work.  The *_PRELOAD_ARCHIVES settings are invoked early
-      # and will pull in the entire archive to the binary giving it
-      # priority in symbol resolution.  Beware of cmake moving the
-      # achive load itself to another place on the link command line.  If
-      # that happens, you can try something like -Wl,-lpng16 here to hide
-      # the archive.  Also be aware that the linker will not tolerate a
-      # second whole-archive load of the archive.  See viewer's
-      # CMakeLists.txt for more information.
-      #
-      set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive)
-      set(PNG_LIBRARIES png16)
-    endif ()
+    set(PNG_LIBRARIES png15)
  endif()
-    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
 endif (STANDALONE)
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -3,64 +3,14 @@
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")

-include(FindAutobuild)
-include(Variables)
-if(INSTALL_PROPRIETARY)
-  include(FindSCP)
-endif(INSTALL_PROPRIETARY)
-
-set(PREBUILD_TRACKING_DIR ${AUTOBUILD_INSTALL_DIR}/cmake_tracking)
-# For the library installation process;
-# see cmake/Prebuild.cmake for the counterpart code.
-if ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DIR}/sentinel_installed")
-  file(MAKE_DIRECTORY ${PREBUILD_TRACKING_DIR})
-  file(WRITE ${PREBUILD_TRACKING_DIR}/sentinel_installed "0")
-endif ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DIR}/sentinel_installed")
-
-# The use_prebuilt_binary macro handles automated installation of package
-# dependencies using autobuild.  The goal is that 'autobuild install' should
-# only be run when we know we need to install a new package.  This should be
-# the case in a clean checkout, or if autobuild.xml has been updated since the
-# last run (encapsulated by the file ${PREBUILD_TRACKING_DIR}/sentinel_installed),
-# or if a previous attempt to install the package has failed (the exit status
-# of previous attempts is serialized in the file
-# ${PREBUILD_TRACKING_DIR}/${_binary}_installed)
 macro (use_prebuilt_binary _binary)
-  if (NOT DEFINED USESYSTEMLIBS_${_binary})
-    set(USESYSTEMLIBS_${_binary} ${USESYSTEMLIBS})
-  endif (NOT DEFINED USESYSTEMLIBS_${_binary})
-
-  if (NOT USESYSTEMLIBS_${_binary})
-    if("${${_binary}_installed}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/${_binary}_installed")
-      file(READ ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${_binary}_installed")
-      if(DEBUG_PREBUILT)
-        message(STATUS "${_binary}_installed: \"${${_binary}_installed}\"")
-      endif(DEBUG_PREBUILT)
-    endif("${${_binary}_installed}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/${_binary}_installed")
-
-    if(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
-      if(DEBUG_PREBUILT)
-        message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
-        --install-dir=${AUTOBUILD_INSTALL_DIR}
-        ${_binary} ")
-      endif(DEBUG_PREBUILT)
-      execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
-        install
-        --install-dir=${AUTOBUILD_INSTALL_DIR}
-        -p ${AUTOBUILD_PLATFORM_NAME}
-        ${_binary}
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        RESULT_VARIABLE ${_binary}_installed
-        )
-      file(WRITE ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${${_binary}_installed}")
-    endif(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
-
-    if(NOT ${_binary}_installed EQUAL 0)
-      message(FATAL_ERROR
-              "Failed to download or unpack prebuilt '${_binary}'."
-              " Process returned ${${_binary}_installed}.")
-    endif (NOT ${_binary}_installed EQUAL 0)
-  endif (NOT USESYSTEMLIBS_${_binary})
+  if(NOT STANDALONE)
+    get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
+    list(FIND PREBUILT_PACKAGES ${_binary} _index)
+    if(_index LESS 0)
+      set_property(TARGET prepare APPEND PROPERTY PREBUILT ${_binary})
+    endif(_index LESS 0)
+  endif(NOT STANDALONE)
 endmacro (use_prebuilt_binary _binary)

 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
--- a/indra/cmake/PulseAudio.cmake
+++ b/indra/cmake/PulseAudio.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)

-set(PULSEAUDIO OFF CACHE BOOL "Build with PulseAudio support, if available.")
+set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.")

 if (PULSEAUDIO)
  if (STANDALONE)
@@ -13,7 +13,7 @@ if (PULSEAUDIO)
    use_prebuilt_binary(pulseaudio)
    set(PULSEAUDIO_FOUND ON FORCE BOOL)
    set(PULSEAUDIO_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/include
+        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
        )
    # We don't need to explicitly link against pulseaudio itself, because
    # the viewer probes for the system's copy at runtime.
--- a/indra/cmake/Qt4.cmake
+++ b/indra/cmake/Qt4.cmake
@@ -0,0 +1,12 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  set(Qt4_FIND_REQUIRED ON)
+
+  include(FindQt4)
+
+  find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
+  include(${QT_USE_FILE})
+  add_definitions(${QT_DEFINITIONS})
+endif (STANDALONE)
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -1,26 +1,15 @@
 # -*- cmake -*-

-if(INSTALL_PROPRIETARY OR USE_QUICKTIME_PREBUILT)
+if(INSTALL_PROPRIETARY)
  include(Prebuilt)
-  if (WINDOWS)
-    use_prebuilt_binary(quicktime)
-  endif (WINDOWS)
-endif(INSTALL_PROPRIETARY OR USE_QUICKTIME_PREBUILT)
+  use_prebuilt_binary(quicktime)
+endif(INSTALL_PROPRIETARY)

 if (DARWIN)
  include(CMakeFindFrameworks)
  find_library(QUICKTIME_LIBRARY QuickTime)
 elseif (WINDOWS AND WORD_SIZE EQUAL 32)
-  SET(program_files "ProgramFiles(x86)")
-  SET(program_files $ENV{${program_files}})
-  if(NOT program_files)
-	SET(program_files $ENV{ProgramW6432})
-  endif(NOT program_files)
-  if(NOT program_files)
-    SET(program_files $ENV{ProgramFiles})
-  endif(NOT program_files)
-
-  set(QUICKTIME_SDK_DIR "${program_files}/QuickTime SDK"
+  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
      CACHE PATH "Location of the QuickTime SDK.")

  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
@@ -44,7 +33,7 @@ elseif (WINDOWS AND WORD_SIZE EQUAL 32)
  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
  
  include_directories(
-    ${LIBS_PREBUILT_DIR}/include/quicktime
+    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
    "${QUICKTIME_SDK_DIR}\\CIncludes"
    )
 endif (DARWIN)
--- a/indra/cmake/TemplateCheck.cmake
+++ b/indra/cmake/TemplateCheck.cmake
@@ -8,7 +8,7 @@ macro (check_message_template _target)
      PRE_LINK
      COMMAND ${PYTHON_EXECUTABLE}
      ARGS ${SCRIPTS_DIR}/template_verifier.py
-           --mode=development --cache_master --master_url=${TEMPLATE_VERIFIER_MASTER_URL} ${TEMPLATE_VERIFIER_OPTIONS}
-      COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py"
+           --mode=development --cache_master
+      COMMENT "Verifying message template"
      )
 endmacro (check_message_template)
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -1,6 +1,5 @@
 # -*- cmake -*-
 include(Prebuilt)
-include(FreeType)

 if (STANDALONE)
  include(FindPkgConfig)
@@ -33,10 +32,11 @@ if (STANDALONE)
  endforeach(pkg)
 else (STANDALONE)
  if (LINUX)
+    use_prebuilt_binary(glib)		# gtk-etc needs glib
    use_prebuilt_binary(gtk-atk-pango-glib)
    set(UI_LIBRARIES
        atk-1.0
-        cairo
+        X11
        gdk-x11-2.0
        gdk_pixbuf-2.0
        Xinerama
@@ -48,19 +48,19 @@ else (STANDALONE)
        gtk-x11-2.0
        pango-1.0
        pangoft2-1.0
+        pangox-1.0
        pangoxft-1.0
        pangocairo-1.0
-        pixman-1
-        X11
-        ${FREETYPE_LIBRARIES}
        )
  endif (LINUX)

  include_directories (
-      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1
      )
  foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/include/${include})
+      include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include})
  endforeach(include)
 endif (STANDALONE)

--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -11,6 +11,6 @@ if (INSTALL)
    set(APP_BIN_DIR bin)
  endif(NOT APP_BIN_DIR)
  if(NOT APP_SHARE_DIR)
-    set(APP_SHARE_DIR share/secondlife-${${ROOT_PROJECT_NAME}_VERSION})
+    set(APP_SHARE_DIR share/secondlife-${viewer_VERSION})
  endif(NOT APP_SHARE_DIR)
 endif (INSTALL)
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -23,65 +23,29 @@ set(LIBS_CLOSED_PREFIX)
 set(LIBS_OPEN_PREFIX)
 set(SCRIPTS_PREFIX ../scripts)
 set(VIEWER_PREFIX)
-set(INTEGRATION_TESTS_PREFIX)
-set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
-
-# Compiler and toolchain options
-set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)")
-set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.")
-option(INCREMENTAL_LINK "Use incremental linking or incremental LTCG for LTO on win32 builds (enable for faster links on some machines)" OFF)
-option(USE_LTO "Enable Whole Program Optimization and related folding and binary reduction routines" OFF)
-
-# Proprietary Library Features
-option(NVAPI "Use nvapi driver interface library" OFF)
-
-if(LIBS_CLOSED_DIR)
-  file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
-else(LIBS_CLOSED_DIR)
-  set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
-endif(LIBS_CLOSED_DIR)
-if(LIBS_COMMON_DIR)
-  file(TO_CMAKE_PATH "${LIBS_COMMON_DIR}" LIBS_COMMON_DIR)
-else(LIBS_COMMON_DIR)
-  set(LIBS_COMMON_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
-endif(LIBS_COMMON_DIR)
-set(LIBS_OPEN_DIR ${LIBS_COMMON_DIR})

+set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
+set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
 set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
 set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
+set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)")
+set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
+set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.")

-set(AUTOBUILD_INSTALL_DIR ${CMAKE_BINARY_DIR}/packages)
-
-set(LIBS_PREBUILT_DIR ${AUTOBUILD_INSTALL_DIR} CACHE PATH
+set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
    "Location of prebuilt libraries.")

-if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
-  # We use this as a marker that you can try to use the proprietary libraries.
-  set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
-endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
-set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
-set(TEMPLATE_VERIFIER_MASTER_URL "http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg" CACHE STRING "Location of the master message template")
-
-if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
-endif (NOT CMAKE_BUILD_TYPE)
-
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
  set(WINDOWS ON BOOL FORCE)
-  if (WORD_SIZE EQUAL 64)
-    set(ARCH x86_64 CACHE STRING "Viewer Architecture")
-    set(LL_ARCH ${ARCH}_win64)
-    set(LL_ARCH_DIR ${ARCH}-win64)
-    set(WORD_SIZE 64)
-    set(AUTOBUILD_PLATFORM_NAME "windows64")
-  else (WORD_SIZE EQUAL 64)
-    set(ARCH i686 CACHE STRING "Viewer Architecture")
+  if (WORD_SIZE EQUAL 32)
+    set(ARCH i686)
    set(LL_ARCH ${ARCH}_win32)
    set(LL_ARCH_DIR ${ARCH}-win32)
-    set(WORD_SIZE 32)
-    set(AUTOBUILD_PLATFORM_NAME "windows")
-  endif (WORD_SIZE EQUAL 64)
+  elseif (WORD_SIZE EQUAL 64)
+    set(ARCH x86_64)
+    set(LL_ARCH ${ARCH}_win)
+    set(LL_ARCH_DIR ${ARCH}-win)
+  endif (WORD_SIZE EQUAL 32)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")

 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -90,26 +54,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  # If someone has specified a word size, use that to determine the
  # architecture.  Otherwise, let the architecture specify the word size.
  if (WORD_SIZE EQUAL 32)
-    #message(STATUS "WORD_SIZE is 32")
    set(ARCH i686)
-    set(AUTOBUILD_PLATFORM_NAME "linux")
  elseif (WORD_SIZE EQUAL 64)
-    #message(STATUS "WORD_SIZE is 64")
    set(ARCH x86_64)
-    set(AUTOBUILD_PLATFORM_NAME "linux64")
  else (WORD_SIZE EQUAL 32)
-    #message(STATUS "WORD_SIZE is UNDEFINED")
-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-      message(STATUS "Size of void pointer is detected as 8; ARCH is 64-bit")
-      set(WORD_SIZE 64)
-      set(AUTOBUILD_PLATFORM_NAME "linux64")
-    elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-      message(STATUS "Size of void pointer is detected as 4; ARCH is 32-bit")
+    if(CMAKE_SIZEOF_VOID_P MATCHES 4)
+      set(ARCH i686)
      set(WORD_SIZE 32)
-      set(AUTOBUILD_PLATFORM_NAME "linux")
-    else()
-      message(FATAL_ERROR "Unkown Architecture!")
-    endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    else(CMAKE_SIZEOF_VOID_P MATCHES 4)
+      set(ARCH x86_64)
+      set(WORD_SIZE 64)
+    endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
  endif (WORD_SIZE EQUAL 32)

  if (NOT STANDALONE AND MULTIARCH_HACK)
@@ -146,6 +101,25 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    COMMAND sh -c "xcodebuild -version | grep Xcode  | cut -d ' ' -f2 | cut -d'.' -f1-2"
    OUTPUT_VARIABLE XCODE_VERSION )
  string(REGEX REPLACE "(\r?\n)+$" "" XCODE_VERSION "${XCODE_VERSION}")
+  
+#   # To support a different SDK update these Xcode settings:
+#   if (XCODE_VERSION GREATER 4.9) # (Which would be 5.0+)
+#     set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
+# 	set(CMAKE_OSX_SYSROOT macosx10.9)
+#   else (XCODE_VERION GREATER 4.9)
+#     if (XCODE_VERSION GREATER 4.5)
+#         set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)
+#         set(CMAKE_OSX_SYSROOT macosx10.8)
+#     else (XCODE_VERSION GREATER 4.5)
+#         if (XCODE_VERSION GREATER 4.2)
+#           set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+#           set(CMAKE_OSX_SYSROOT macosx10.7)
+#         else (XCODE_VERSION GREATER 4.2)
+#           set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+#           set(CMAKE_OSX_SYSROOT macosx10.7)
+#         endif (XCODE_VERSION GREATER 4.2)
+#     endif (XCODE_VERSION GREATER 4.5)
+#   endif (XCODE_VERSION GREATER 4.9)

  # Hardcode SDK we build against until we can test and allow newer ones
  # as autodetected in the code above
@@ -175,28 +149,37 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set(CMAKE_OSX_ARCHITECTURES i386)
  set(ARCH i386)
  set(WORD_SIZE 32)
-  set(AUTOBUILD_PLATFORM_NAME "darwin")

  set(LL_ARCH ${ARCH}_darwin)
  set(LL_ARCH_DIR universal-darwin)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

+if (WINDOWS AND WORD_SIZE EQUAL 32)
+  set(PREBUILT_TYPE windows)
+elseif (WINDOWS AND WORD_SIZE EQUAL 64)
+  set(PREBUILT_TYPE windows64)
+elseif(DARWIN)
+  set(PREBUILT_TYPE darwin)
+elseif(LINUX AND WORD_SIZE EQUAL 32)
+  set(PREBUILT_TYPE linux)
+elseif(LINUX AND WORD_SIZE EQUAL 64)
+  set(PREBUILT_TYPE linux64)
+endif(WINDOWS AND WORD_SIZE EQUAL 32)
+
 # Default deploy grid
 set(GRID agni CACHE STRING "Target Grid")

-set(VIEWER_CHANNEL "Singularity Test" CACHE STRING "Viewer Channel Name")
+set(VIEWER_CHANNEL "Singularity" CACHE STRING "Viewer Channel Name")
+set(VIEWER_LOGIN_CHANNEL "${VIEWER_CHANNEL}" CACHE STRING "Fake login channel for A/B Testing")
+set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")

-string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL})
-set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.")
+# *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc
+string(REGEX REPLACE " +" "" VIEWER_CHANNEL_ONE_WORD "${VIEWER_CHANNEL}")
+set(VIEWER_BRANDING_NAME "${VIEWER_CHANNEL_ONE_WORD}")
+set(VIEWER_BRANDING_NAME_CAMELCASE "${VIEWER_CHANNEL_ONE_WORD}")

-set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
-set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
-
-set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")

-set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
-
 source_group("CMake Rules" FILES CMakeLists.txt)

 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,8 +2,12 @@
 include(Prebuilt)

 if (NOT STANDALONE)
-  use_prebuilt_binary(slvoice)
+  use_prebuilt_binary(vivox)
  if(LINUX)
+	use_prebuilt_binary(libuuid)
+    if (${ARCH} STREQUAL "x86_64")
+     use_prebuilt_binary(32bitcompatibilitylibs)
+	endif (${ARCH} STREQUAL "x86_64")
    use_prebuilt_binary(fontconfig)
  endif(LINUX)
 else (NOT STANDALONE)
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -0,0 +1,62 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+include(LLQtWebkit)
+include(Qt4)
+
+if (STANDALONE)
+    set(WEBKITLIBPLUGIN OFF CACHE BOOL
+        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
+else (STANDALONE)
+    use_prebuilt_binary(llqtwebkit)
+    set(WEBKITLIBPLUGIN ON CACHE BOOL
+        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
+endif (STANDALONE)
+
+if (WINDOWS)
+    set(WEBKIT_PLUGIN_LIBRARIES 
+    debug llqtwebkitd
+    debug QtWebKitd4
+    debug QtOpenGLd4
+    debug QtNetworkd4
+    debug QtGuid4
+    debug QtCored4
+    debug qtmaind
+    optimized llqtwebkit
+    optimized QtWebKit4
+    optimized QtOpenGL4
+    optimized QtNetwork4
+    optimized QtGui4
+    optimized QtCore4
+    optimized qtmain
+    )
+elseif (DARWIN)
+    set(WEBKIT_PLUGIN_LIBRARIES
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib
+        )
+elseif (LINUX)
+     if (STANDALONE)
+       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
+     else (STANDALONE)
+       set(WEBKIT_PLUGIN_LIBRARIES
+        llqtwebkit
+        QtWebKit
+        QtOpenGL
+        QtNetwork
+        QtGui
+        QtCore
+        crypto
+        ssl
+#       qgif
+#       qjpeg
+        jscore
+        jpeg
+        fontconfig
+        X11
+        Xrender
+        Xext
+        GL
+        )
+     endif (STANDALONE)
+endif (WINDOWS)
--- a/indra/cmake/WinManifest.cmake
+++ b/indra/cmake/WinManifest.cmake
@@ -1,17 +0,0 @@
-# - Embeds a specific manifest file in a Windows binary
-# Defines the following:
-# EMBED_MANIFEST - embed manifest in a windows binary with mt
-# Parameters - _target is the target file, type - 1 for EXE, 2 for DLL
-
-  MACRO(EMBED_MANIFEST _target type)
-    ADD_CUSTOM_COMMAND(
-      TARGET ${_target}
-      POST_BUILD
-      COMMAND "mt.exe"
-      ARGS
-        -manifest \"${CMAKE_SOURCE_DIR}\\tools\\manifests\\compatibility.manifest\"
-        -inputresource:\"$<TARGET_FILE:${_target}>\"\;\#${type}
-        -outputresource:\"$<TARGET_FILE:${_target}>\"\;\#${type}
-      COMMENT "Adding compatibility manifest to ${_target}"
-    )
-  ENDMACRO(EMBED_MANIFEST _target type)
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -8,13 +8,6 @@ if (STANDALONE)
  include(FindXmlRpcEpi)
 else (STANDALONE)
    use_prebuilt_binary(xmlrpc-epi)
-    if (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES
-            debug xmlrpc-epid
-            optimized xmlrpc-epi
-        )
-    else (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
-    endif (WINDOWS)
-    set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+    set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
+    set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
--- a/indra/cmake/ZLIB.cmake
+++ b/indra/cmake/ZLIB.cmake
@@ -13,25 +13,10 @@ else (STANDALONE)
    set(ZLIB_LIBRARIES 
      debug zlibd
      optimized zlib)
-  elseif (LINUX)
-    #
-    # When we have updated static libraries in competition with older
-    # shared libraries and we want the former to win, we need to do some
-    # extra work.  The *_PRELOAD_ARCHIVES settings are invoked early
-    # and will pull in the entire archive to the binary giving it 
-    # priority in symbol resolution.  Beware of cmake moving the
-    # achive load itself to another place on the link command line.  If
-    # that happens, you can try something like -Wl,-lz here to hide
-    # the archive.  Also be aware that the linker will not tolerate a
-    # second whole-archive load of the archive.  See viewer's
-    # CMakeLists.txt for more information.
-    #
-    set(ZLIB_PRELOAD_ARCHIVES -Wl,--whole-archive z -Wl,--no-whole-archive)
-    set(ZLIB_LIBRARIES z)
  else (WINDOWS)
    set(ZLIB_LIBRARIES z)
  endif (WINDOWS)
  if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
  endif (WINDOWS OR LINUX)
 endif (STANDALONE)
--- a/indra/cmake/cmake_dummy.cpp
+++ b/indra/cmake/cmake_dummy.cpp
@@ -1,24 +1,30 @@
 /** 
 * @file cmake_dummy.cpp
 *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
 * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
 * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
 * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
 */
--- a/indra/copy_win_scripts/start-client.py
+++ b/indra/copy_win_scripts/start-client.py
@@ -1,28 +1,4 @@
 #!/usr/bin/env python
-"""\
-@file   start-client.py
-
-$LicenseInfo:firstyear=2010&license=viewerlgpl$
-Second Life Viewer Source Code
-Copyright (C) 2010-2011, Linden Research, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation;
-version 2.1 of the License only.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-$/LicenseInfo$
-"""
 import sys, getopt
 import os
 import llstart
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -0,0 +1,856 @@
+#!/usr/bin/env python
+#
+# @file develop.py
+# @authors Bryan O'Sullivan, Mark Palange, Aaron Brashears
+# @brief Fire and forget script to appropriately configure cmake for SL.
+#
+# $LicenseInfo:firstyear=2007&license=viewergpl$
+# 
+# Copyright (c) 2007-2009, Linden Research, Inc.
+# 
+# Second Life Viewer Source Code
+# The source code in this file ("Source Code") is provided by Linden Lab
+# to you under the terms of the GNU General Public License, version 2.0
+# ("GPL"), unless you have obtained a separate licensing agreement
+# ("Other License"), formally executed by you and Linden Lab.  Terms of
+# the GPL can be found in doc/GPL-license.txt in this distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+# 
+# There are special exceptions to the terms and conditions of the GPL as
+# it is applied to this Source Code. View the full text of the exception
+# in the file doc/FLOSS-exception.txt in this software distribution, or
+# online at
+# http://secondlifegrid.net/programs/open_source/licensing/flossexception
+# 
+# By copying, modifying or distributing this software, you acknowledge
+# that you have read and understood your obligations described above,
+# and agree to abide by those obligations.
+# 
+# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+# COMPLETENESS OR PERFORMANCE.
+# $/LicenseInfo$
+
+
+import errno
+import getopt
+import os
+import random
+import re
+import shutil
+import socket
+import sys
+import commands
+
+class CommandError(Exception):
+    pass
+
+def mkdir(path):
+    try:
+        os.mkdir(path)
+        return path
+    except OSError, err:
+        if err.errno != errno.EEXIST or not os.path.isdir(path):
+            raise
+
+def prettyprint_path_for_cmake(path):
+    if 'a' <= path[0] <= 'z' and path[1] == ':':
+        # CMake wants DOS drive letters to be in uppercase.  The above
+        # condition never asserts on platforms whose full path names
+        # always begin with a slash, so we don't need to test whether
+        # we are running on Windows.
+        path = path[0].upper() + path[1:]
+    return path
+
+def getcwd():
+    return prettyprint_path_for_cmake(os.getcwd())
+
+source_indra = prettyprint_path_for_cmake(os.path.dirname(os.path.realpath(__file__)))
+
+def quote(opts):
+    return '"' + '" "'.join([ opt.replace('"', '') for opt in opts ]) + '"'
+
+class PlatformSetup(object):
+    generator = None
+    build_types = {}
+    for t in ('Debug', 'Release', 'RelWithDebInfo'):
+        build_types[t.lower()] = t
+
+    build_type = build_types['relwithdebinfo']
+    standalone = 'OFF'
+    unattended = 'OFF'
+    universal = 'OFF'
+    project_name = 'Singularity'
+    distcc = True
+    cmake_opts = []
+    word_size = 32
+    using_express = False
+
+    def __init__(self):
+        self.script_dir = os.path.realpath(
+            os.path.dirname(__import__(__name__).__file__))
+
+    def os(self):
+        '''Return the name of the OS.'''
+
+        raise NotImplemented('os')
+
+    def arch(self):
+        '''Return the CPU architecture.'''
+
+        return None
+
+    def platform(self):
+        '''Return a stringified two-tuple of the OS name and CPU
+        architecture.'''
+
+        ret = self.os()
+        if self.arch():
+            ret += '-' + self.arch()
+        return ret 
+
+    def build_dirs(self):
+        '''Return the top-level directories in which builds occur.
+
+        This can return more than one directory, e.g. if doing a
+        32-bit viewer and server build on Linux.'''
+
+        return ['build-' + self.platform()]
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        '''Return the command line to run cmake with.'''
+
+        args = dict(
+            dir=src_dir,
+            generator=self.generator,
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            word_size=self.word_size,
+            type=self.build_type.upper(),
+            )
+        #if simple:
+        #    return 'cmake %(opts)s %(dir)r' % args
+        return ('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '-DWORD_SIZE:STRING=%(word_size)s '
+                '-G %(generator)r %(opts)s %(dir)r' % args)
+
+    def run_cmake(self, args=[]):
+        '''Run cmake.'''
+
+        # do a sanity check to make sure we have a generator
+        if not hasattr(self, 'generator'):
+            raise "No generator available for '%s'" % (self.__name__,)
+        cwd = getcwd()
+        created = []
+        try:
+            for d in self.build_dirs():
+                simple = True
+                if mkdir(d):
+                    created.append(d)
+                    simple = False
+                try:
+                    os.chdir(d)
+                    cmd = self.cmake_commandline(source_indra, d, args, simple)
+                    print 'Running %r in %r' % (cmd, d)
+                    self.run(cmd, 'cmake')
+                finally:
+                    os.chdir(cwd)
+        except:
+            # If we created a directory in which to run cmake and
+            # something went wrong, the directory probably just
+            # contains garbage, so delete it.
+            os.chdir(cwd)
+            for d in created:
+                print 'Cleaning %r' % d
+                shutil.rmtree(d)
+            raise
+
+    def parse_build_opts(self, arguments):
+        opts, targets = getopt.getopt(arguments, 'D:o:', ['option='])
+        build_opts = []
+        for o, a in opts:
+            if o in ('-o', '--option'):
+                build_opts.append(a)
+        return build_opts, targets
+
+    def run_build(self, opts, targets):
+        '''Build the default targets for this platform.'''
+
+        raise NotImplemented('run_build')
+
+    def cleanup(self):
+        '''Delete all build directories.'''
+
+        cleaned = 0
+        for d in self.build_dirs():
+            if os.path.isdir(d):
+                print 'Cleaning %r' % d
+                shutil.rmtree(d)
+                cleaned += 1
+        if not cleaned:
+            print 'Nothing to clean up!'
+
+    def is_internal_tree(self):
+        '''Indicate whether we are building in an internal source tree.'''
+
+        return os.path.isdir(os.path.join(self.script_dir, 'newsim'))
+
+    def find_in_path(self, name, defval=None, basename=False):
+        for ext in self.exe_suffixes:
+            name_ext = name + ext
+            if os.sep in name_ext:
+                path = os.path.abspath(name_ext)
+                if os.access(path, os.X_OK):
+                    return [basename and os.path.basename(path) or path]
+            for p in os.getenv('PATH', self.search_path).split(os.pathsep):
+                path = os.path.join(p, name_ext)
+                if os.access(path, os.X_OK):
+                    return [basename and os.path.basename(path) or path]
+        if defval:
+            return [defval]
+        return []
+
+
+class UnixSetup(PlatformSetup):
+    '''Generic Unixy build instructions.'''
+
+    search_path = '/usr/bin:/usr/local/bin'
+    exe_suffixes = ('',)
+
+    def __init__(self):
+        PlatformSetup.__init__(self)
+        super(UnixSetup, self).__init__()
+        self.generator = 'Unix Makefiles'
+
+    def os(self):
+        return 'unix'
+
+    def arch(self):
+        cpu = os.uname()[-1]
+        if cpu.endswith('386'):
+            cpu = 'i386'
+        elif cpu.endswith('86'):
+            cpu = 'i686'
+        elif cpu in ('athlon',):
+            cpu = 'i686'
+        elif cpu == 'Power Macintosh':
+            cpu = 'ppc'
+        elif cpu == 'x86_64' and self.word_size == 32:
+            cpu = 'i686'
+        return cpu
+
+    def run(self, command, name=None):
+        '''Run a program.  If the program fails, raise an exception.'''
+        ret = os.system(command)
+        if ret:
+            if name is None:
+                name = command.split(None, 1)[0]
+            if os.WIFEXITED(ret):
+                st = os.WEXITSTATUS(ret)
+                if st == 127:
+                    event = 'was not found'
+                else:
+                    event = 'exited with status %d' % st
+            elif os.WIFSIGNALED(ret):
+                event = 'was killed by signal %d' % os.WTERMSIG(ret)
+            else:
+                event = 'died unexpectedly (!?) with 16-bit status %d' % ret
+            raise CommandError('the command %r %s' %
+                               (name, event))
+
+
+class LinuxSetup(UnixSetup):
+    def __init__(self):
+        UnixSetup.__init__(self)
+        super(LinuxSetup, self).__init__()
+        try:
+            self.debian_sarge = open('/etc/debian_version').read().strip() == '3.1'
+        except:
+            self.debian_sarge = False
+
+    def os(self):
+        return 'linux'
+
+    def build_dirs(self):
+        platform_build = '%s-%s' % (self.platform(), self.build_type.lower())
+
+        return ['viewer-' + platform_build]
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        args = dict(
+            dir=src_dir,
+            generator=self.generator,
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            type=self.build_type.upper(),
+            project_name=self.project_name,
+            word_size=self.word_size,
+            cxx="g++"
+            )
+
+        cmd = (('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
+                '-G %(generator)r -DSTANDALONE:BOOL=%(standalone)s '
+                '-DWORD_SIZE:STRING=%(word_size)s '
+                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
+                '%(opts)s %(dir)r')
+               % args)
+        if 'CXX' not in os.environ:
+            args.update({'cmd':cmd})
+            cmd = ('CXX=%(cxx)r %(cmd)s' % args)
+        return cmd
+
+    def run_build(self, opts, targets):
+        job_count = None
+
+        for i in range(len(opts)):
+            if opts[i].startswith('-j'):
+                try:
+                    job_count = int(opts[i][2:])
+                except ValueError:
+                    try:
+                        job_count = int(opts[i+1])
+                    except ValueError:
+                        job_count = True
+
+        def get_cpu_count():
+            count = 0
+            for line in open('/proc/cpuinfo'):
+                if re.match(r'processor\s*:', line):
+                    count += 1
+            return count
+
+        def localhost():
+            count = get_cpu_count()
+            return 'localhost/' + str(count), count
+
+        def get_distcc_hosts():
+            try:
+                hosts = []
+                name = os.getenv('DISTCC_DIR', '/etc/distcc') + '/hosts'
+                for l in open(name):
+                    l = l[l.find('#')+1:].strip()
+                    if l: hosts.append(l)
+                return hosts
+            except IOError:
+                return (os.getenv('DISTCC_HOSTS', '').split() or
+                        [localhost()[0]])
+
+        def count_distcc_hosts():
+            cpus = 0
+            hosts = 0
+            for host in get_distcc_hosts():
+                m = re.match(r'.*/(\d+)', host)
+                hosts += 1
+                cpus += m and int(m.group(1)) or 1
+            return hosts, cpus
+
+        def mk_distcc_hosts(basename, range, num_cpus):
+            '''Generate a list of LL-internal machines to build on.'''
+            loc_entry, cpus = localhost()
+            hosts = [loc_entry]
+            dead = []
+            stations = [s for s in xrange(range) if s not in dead]
+            random.shuffle(stations)
+            hosts += ['%s%d.lindenlab.com/%d,lzo' % (basename, s, num_cpus) for s in stations]
+            cpus += 2 * len(stations)
+            return ' '.join(hosts), cpus
+
+        if job_count is None:
+            hosts, job_count = count_distcc_hosts()
+            if hosts == 1:
+                hostname = socket.gethostname()
+                if hostname.startswith('station'):
+                    hosts, job_count = mk_distcc_hosts('station', 36, 2)
+                    os.environ['DISTCC_HOSTS'] = hosts
+                if hostname.startswith('eniac'):
+                    hosts, job_count = mk_distcc_hosts('eniac', 71, 2)
+                    os.environ['DISTCC_HOSTS'] = hosts
+            if job_count > 4:
+                job_count = 4;
+            opts.extend(['-j', str(job_count)])
+
+        if targets:
+            targets = ' '.join(targets)
+        else:
+            targets = 'all'
+
+        for d in self.build_dirs():
+            cmd = 'make -C %r %s %s' % (d, ' '.join(opts), targets)
+            print 'Running %r' % cmd
+            self.run(cmd)
+
+        
+class DarwinSetup(UnixSetup):
+    def __init__(self):
+        UnixSetup.__init__(self)
+        super(DarwinSetup, self).__init__()
+        self.generator = 'Xcode'
+
+    def os(self):
+        return 'darwin'
+
+    def arch(self):
+        if self.universal == 'ON':
+            return 'universal'
+        else:
+            return UnixSetup.arch(self)
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        args = dict(
+            dir=src_dir,
+            generator=self.generator,
+            opts=quote(opts),
+            standalone=self.standalone,
+            word_size=self.word_size,
+            unattended=self.unattended,
+            project_name=self.project_name,
+            universal=self.universal,
+            type=self.build_type.upper(),
+            )
+        if self.universal == 'ON':
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+        #if simple:
+        #    return 'cmake %(opts)s %(dir)r' % args
+        return ('cmake -G %(generator)r '
+                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '-DWORD_SIZE:STRING=%(word_size)s '
+                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
+                '%(universal)s '
+                '%(opts)s %(dir)r' % args)
+
+    def run_build(self, opts, targets):
+        cwd = getcwd()
+        if targets:
+            targets = ' '.join(['-target ' + repr(t) for t in targets])
+        else:
+            targets = ''
+        cmd = ('xcodebuild -configuration %s %s %s' %
+               (self.build_type, ' '.join(opts), targets))
+        for d in self.build_dirs():
+            try:
+                os.chdir(d)
+                print 'Running %r in %r' % (cmd, d)
+                self.run(cmd)
+            finally:
+                os.chdir(cwd)
+
+
+class WindowsSetup(PlatformSetup):
+    gens = {
+        'vc100' : {
+            'gen' : r'Visual Studio 10',
+            'ver' : r'10.0'
+            },
+        'vc110' : {
+            'gen' : r'Visual Studio 11',
+            'ver' : r'11.0'
+            }
+        }
+    
+    gens['vs2010'] = gens['vc100']
+    gens['vs2012'] = gens['vc110']
+
+    search_path = r'C:\windows'
+    exe_suffixes = ('.exe', '.bat', '.com')
+
+    def __init__(self):
+        PlatformSetup.__init__(self)
+        super(WindowsSetup, self).__init__()
+        self._generator = None
+        self.incredibuild = False
+
+    def _get_generator(self):
+        if self._generator is None:
+            for version in 'vc100'.split():
+                if self.find_visual_studio(version):
+                    self._generator = version
+                    print 'Building with ', self.gens[version]['gen']
+                    break
+            else:
+                print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
+                for version in 'vc100'.split():
+                    if self.find_visual_studio_express(version):
+                        self._generator = version
+                        self.using_express = True
+                        print 'Building with ', self.gens[version]['gen'] , "Express edition"
+                        break
+                else:
+					for version in 'vc100'.split():
+						if self.find_visual_studio_express_single(version):
+							self._generator = version
+							self.using_express = True
+							print 'Building with ', self.gens[version]['gen'] , "Express edition"
+							break
+					else:
+						print >> sys.stderr, 'Cannot find any Visual Studio installation'
+						sys.exit(1)
+        return self._generator
+
+    def _set_generator(self, gen):
+        self._generator = gen
+
+    generator = property(_get_generator, _set_generator)
+
+    def os(self):
+        return 'win32'
+
+    def build_dirs(self):
+        if self.word_size == 64:
+            return ['build-' + self.generator + '-Win64']
+        else:
+            return ['build-' + self.generator]
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        args = dict(
+            dir=src_dir,
+            generator=self.gens[self.generator.lower()]['gen'],
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            project_name=self.project_name,
+            word_size=self.word_size,
+            )
+        if self.word_size == 64:
+            args["generator"] += r' Win64'
+
+        #if simple:
+        #    return 'cmake %(opts)s "%(dir)s"' % args
+        return ('cmake -G "%(generator)s" '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DUNATTENDED:BOOL=%(unattended)s '
+                '-DWORD_SIZE:STRING=%(word_size)s '
+                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
+                '%(opts)s "%(dir)s"' % args)
+
+    def get_HKLM_registry_value(self, key_str, value_str):
+        import _winreg
+        reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+        key = _winreg.OpenKey(reg, key_str)
+        value = _winreg.QueryValueEx(key, value_str)[0]
+        print 'Found: %s' % value
+        return value
+        
+    def find_visual_studio(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        value_str = (r'EnvironmentDirectory')
+        key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
+                   self.gens[gen]['ver'])
+        print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
+               (key_str, value_str))
+        try:
+            return self.get_HKLM_registry_value(key_str, value_str)           
+        except WindowsError, err:
+            key_str = (r'SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%s\Setup\VS' %
+                       self.gens[gen]['ver'])
+
+        try:
+            return self.get_HKLM_registry_value(key_str, value_str)
+        except:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+        return ''
+        
+    def find_visual_studio_express(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
+        
+    def find_visual_studio_express_single(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s_Config\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_CURRENT_USER\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_CURRENT_USER)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
+
+    def get_build_cmd(self):
+        if self.incredibuild:
+            config = self.build_type
+            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
+                config = '\"%s|Win32\"' % config
+
+            return "buildconsole %s.sln /build %s" % (self.project_name, config)
+        environment = self.find_visual_studio()
+        if environment == '':
+            environment = self.find_visual_studio_express()
+            if environment == '':
+                environment = self.find_visual_studio_express_single()
+                if environment == '':
+                    print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+                else:
+                    build_dirs=self.build_dirs()
+                    print >> sys.stderr, "\nSolution generation complete, it can can now be found in:", build_dirs[0]    
+                    print >> sys.stderr, "\nAs you are using an Express Visual Studio, the build step cannot be automated"
+                    print >> sys.stderr, "\nPlease see https://wiki.secondlife.com/wiki/Microsoft_Visual_Studio#Extra_steps_for_Visual_Studio_Express_editions for Visual Studio Express specific information"
+                    exit(0)
+    
+        # devenv.com is CLI friendly, devenv.exe... not so much.
+        return ('"%sdevenv.com" %s.sln /build %s' % 
+                (self.find_visual_studio(), self.project_name, self.build_type))
+
+    def run(self, command, name=None):
+        '''Run a program.  If the program fails, raise an exception.'''
+        ret = os.system(command)
+        if ret:
+            if name is None:
+                name = command.split(None, 1)[0]
+            path = self.find_in_path(name)
+            if not path:
+                ret = 'was not found'
+            else:
+                ret = 'exited with status %d' % ret
+            raise CommandError('the command %r %s' %
+                               (name, ret))
+
+    def run_cmake(self, args=[]):
+        '''Override to add the vstool.exe call after running cmake.'''
+        PlatformSetup.run_cmake(self, args)
+        if self.unattended == 'OFF':
+            if self.using_express == False:
+                self.run_vstool()
+
+    def run_vstool(self):
+        for build_dir in self.build_dirs():
+            stamp = os.path.join(build_dir, 'vstool.txt')
+            try:
+                prev_build = open(stamp).read().strip()
+            except IOError:
+                prev_build = ''
+            if prev_build == self.build_type:
+                # Only run vstool if the build type has changed.
+                continue
+            vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
+                          ' --solution ' +
+                          os.path.join(build_dir,'Singularity.sln') +
+                          ' --config ' + self.build_type +
+                          ' --startup secondlife-bin')
+            print 'Running vstool %r in %r' % (vstool_cmd, getcwd())
+            self.run(vstool_cmd)        
+            print >> open(stamp, 'w'), self.build_type
+        
+    def run_build(self, opts, targets):
+        cwd = getcwd()
+        build_cmd = self.get_build_cmd()
+
+        for d in self.build_dirs():
+            try:
+                os.chdir(d)
+                if targets:
+                    for t in targets:
+                        cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
+                        print 'Running build(targets) %r in %r' % (cmd, d)
+                        self.run(cmd)
+                else:
+                    cmd = '%s %s' % (build_cmd, ' '.join(opts))
+                    print 'Running build %r in %r' % (cmd, d)
+                    self.run(cmd)
+            finally:
+                os.chdir(cwd)
+                
+class CygwinSetup(WindowsSetup):
+    def __init__(self):
+        super(CygwinSetup, self).__init__()
+        self.generator = 'vc80'
+
+    def cmake_commandline(self, src_dir, build_dir, opts, simple):
+        dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
+        args = dict(
+            dir=dos_dir,
+            generator=self.gens[self.generator.lower()]['gen'],
+            opts=quote(opts),
+            standalone=self.standalone,
+            unattended=self.unattended,
+            project_name=self.project_name,
+            word_size=self.word_size,
+            )
+        if self.word_size == 64:
+            args["generator"] += r' Win64'
+        #if simple:
+        #    return 'cmake %(opts)s "%(dir)s"' % args
+        return ('cmake -G "%(generator)s" '
+                '-DUNATTENDED:BOOl=%(unattended)s '
+                '-DSTANDALONE:BOOL=%(standalone)s '
+                '-DWORD_SIZE:STRING=%(word_size)s '
+                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
+                '%(opts)s "%(dir)s"' % args)
+
+setup_platform = {
+    'darwin': DarwinSetup,
+    'linux2': LinuxSetup,
+    'linux3': LinuxSetup,
+    'win32' : WindowsSetup,
+    'cygwin' : CygwinSetup
+    }
+
+
+usage_msg = '''
+Usage:   develop.py [options] [command [command-options]]
+
+Options:
+  -h | --help           print this help message
+       --standalone     build standalone, without Linden prebuild libraries
+       --unattended     build unattended, do not invoke any tools requiring
+                        a human response
+       --universal      build a universal binary on Mac OS X (unsupported)
+  -t | --type=NAME      build type ("Debug", "Release", or "RelWithDebInfo")
+  -m32 | -m64           build architecture (32-bit or 64-bit)
+  -N | --no-distcc      disable use of distcc
+  -G | --generator=NAME generator name
+                        Windows: VC100 (VS2010) (default)
+                        Mac OS X: Xcode (default), Unix Makefiles
+                        Linux: Unix Makefiles (default), KDevelop3
+  -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
+                        
+Commands:
+  build           configure and build default target
+  clean           delete all build directories, does not affect sources
+  configure       configure project by running cmake (default if none given)
+  printbuilddirs  print the build directory that will be used
+
+Command-options for "configure":
+  We use cmake variables to change the build configuration.
+  -DPACKAGE:BOOL=ON          Create "package" target to make installers
+  -DLOCALIZESETUP:BOOL=ON    Create one win_setup target per supported language
+  -DLL_TESTS:BOOL=OFF        Don't generate unit test projects
+  -DEXAMPLEPLUGIN:BOOL=OFF   Don't generate example plugin project
+  -DDISABLE_TCMALLOC:BOOL=ON Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)
+
+Examples:
+  Set up a Visual Studio 2010 project with "package" target:
+    develop.py -G vc100 configure -DPACKAGE:BOOL=ON
+'''
+
+def main(arguments):
+    setup = setup_platform[sys.platform]()
+    try:
+        opts, args = getopt.getopt(
+            arguments,
+            '?hNt:p:G:m:',
+            ['help', 'standalone', 'no-distcc', 'unattended', 'type=', 'incredibuild', 'generator=', 'project='])
+    except getopt.GetoptError, err:
+        print >> sys.stderr, 'Error:', err
+        print >> sys.stderr, """
+Note: You must pass -D options to cmake after the "configure" command
+For example: develop.py configure -DSERVER:BOOL=OFF"""
+        print >> sys.stderr, usage_msg.strip()
+        sys.exit(1)
+
+    for o, a in opts:
+        if o in ('-?', '-h', '--help'):
+            print usage_msg.strip()
+            sys.exit(0)
+        elif o in ('--standalone',):
+            setup.standalone = 'ON'
+        elif o in ('--unattended',):
+            setup.unattended = 'ON'
+        elif o in ('-m',):
+            if a in ('32', '64'):
+                setup.word_size = int(a)
+            else:
+                print >> sys.stderr, 'Error: unknown word size', repr(a)
+                print >> sys.stderr, 'Supported word sizes: 32, 64'
+                sys.exit(1)
+        elif o in ('-t', '--type'):
+            try:
+                setup.build_type = setup.build_types[a.lower()]
+            except KeyError:
+                print >> sys.stderr, 'Error: unknown build type', repr(a)
+                print >> sys.stderr, 'Supported build types:'
+                types = setup.build_types.values()
+                types.sort()
+                for t in types:
+                    print ' ', t
+                sys.exit(1)
+        elif o in ('-G', '--generator'):
+            setup.generator = a
+        elif o in ('-N', '--no-distcc'):
+            setup.distcc = False
+        elif o in ('-p', '--project'):
+            setup.project_name = a
+        elif o in ('--incredibuild'):
+            setup.incredibuild = True
+        else:
+            print >> sys.stderr, 'INTERNAL ERROR: unhandled option', repr(o)
+            sys.exit(1)
+    if not args:
+        setup.run_cmake()
+        return
+    try:
+        cmd = args.pop(0)
+        if cmd in ('cmake', 'configure'):
+            setup.run_cmake(args)
+        elif cmd == 'build':
+            if os.getenv('DISTCC_DIR') is None:
+                distcc_dir = os.path.join(getcwd(), '.distcc')
+                if not os.path.exists(distcc_dir):
+                    os.mkdir(distcc_dir)
+                print "setting DISTCC_DIR to %s" % distcc_dir
+                os.environ['DISTCC_DIR'] = distcc_dir
+            else:
+                print "DISTCC_DIR is set to %s" % os.getenv('DISTCC_DIR')
+            for d in setup.build_dirs():
+                if not os.path.exists(d):
+                    raise CommandError('run "develop.py cmake" first')
+            setup.run_cmake()
+            opts, targets = setup.parse_build_opts(args)
+            setup.run_build(opts, targets)
+        elif cmd == 'clean':
+            if args:
+                raise CommandError('clean takes no arguments')
+            setup.cleanup()
+        elif cmd == 'printbuilddirs':
+            for d in setup.build_dirs():
+                print >> sys.stdout, d
+        else:
+            print >> sys.stderr, 'Error: unknown subcommand', repr(cmd)
+            print >> sys.stderr, "(run 'develop.py --help' for help)"
+            sys.exit(1)
+    except getopt.GetoptError, err:
+        print >> sys.stderr, 'Error with %r subcommand: %s' % (cmd, err)
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    try:
+        main(sys.argv[1:])
+    except CommandError, err:
+        print >> sys.stderr, 'Error:', err
+        sys.exit(1)
--- a/indra/lib/python/indra/init.py
+++ b/indra/lib/python/indra/init.py
@@ -2,24 +2,19 @@
@file __init__.py
@brief Initialization file for the indra module.

-$LicenseInfo:firstyear=2006&license=viewerlgpl$
-Second Life Viewer Source Code
-Copyright (C) 2006-2010, Linden Research, Inc.
+$LicenseInfo:firstyear=2006&license=internal$

-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation;
-version 2.1 of the License only.
+Copyright (c) 2006-2009, Linden Research, Inc.

-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
+The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+this source code is governed by the Linden Lab Source Code Disclosure
+Agreement ("Agreement") previously entered between you and Linden
+Lab. By accessing, using, copying, modifying or distributing this
+software, you acknowledge that you have been informed of your
+obligations under the Agreement and agree to abide by those obligations.

-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+COMPLETENESS OR PERFORMANCE.
 $/LicenseInfo$
 """
--- a/indra/lib/python/indra/base/cllsd_test.py
+++ b/indra/lib/python/indra/base/cllsd_test.py
@@ -1,25 +1,3 @@
-#!/usr/bin/python
-## 
-## $LicenseInfo:firstyear=2011&license=viewerlgpl$
-## Second Life Viewer Source Code
-## Copyright (C) 2011, Linden Research, Inc.
-## 
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## version 2.1 of the License only.
-## 
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-## 
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-## 
-## Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-## $/LicenseInfo$
 from indra.base import llsd, lluuid
 from datetime import datetime
 import cllsd
@@ -32,7 +10,7 @@ values = (
    '&<>',
    u'\u81acj',
    llsd.uri('http://foo<'),
-    lluuid.UUID(),
+    lluuid.LLUUID(),
    llsd.LLSD(['thing']),
    1,
    myint(31337),
--- a/indra/lib/python/indra/base/lllog.py
+++ b/indra/lib/python/indra/base/lllog.py
@@ -0,0 +1,72 @@
+"""\
+@file lllog.py
+@brief Logging for event processing
+
+$LicenseInfo:firstyear=2008&license=mit$
+
+Copyright (c) 2008-2009, Linden Research, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+$/LicenseInfo$
+"""
+
+from indra.base.llsd import format_notation
+
+try:
+    import syslog
+except ImportError:
+    # Windows
+    import sys
+
+    class syslog(object):
+        _logfp = sys.stderr
+
+        def syslog(msg):
+            _logfp.write(msg)
+            if not msg.endswith('\n'):
+                _logfp.write('\n')
+
+        syslog = staticmethod(syslog)
+
+class Logger(object):
+    def __init__(self, name='indra'):
+        self._sequence = 0
+        try:
+            syslog.openlog(name, syslog.LOG_CONS | syslog.LOG_PID,
+                           syslog.LOG_LOCAL0)
+        except AttributeError:
+            # No syslog module on Windows
+            pass
+
+    def next(self):
+        self._sequence += 1
+        return self._sequence
+
+    def log(self, msg, llsd):
+        payload = 'INFO: log: LLLOGMESSAGE (%d) %s %s' % (self.next(), msg,
+                                               format_notation(llsd))
+        syslog.syslog(payload)
+
+_logger = None
+
+def log(msg, llsd):
+    global _logger
+    if _logger is None:
+        _logger = Logger()
+    _logger.log(msg, llsd)
--- a/indra/lib/python/indra/base/llsd.py
+++ b/indra/lib/python/indra/base/llsd.py
@@ -72,11 +72,8 @@ BOOL_FALSE = ('0', '0.0', 'false', '')


 def format_datestr(v):
-    """ Formats a datetime or date object into the string format shared by xml and notation serializations."""
-    if hasattr(v, 'microsecond'):
-        return v.isoformat() + 'Z'
-    else:
-        return v.strftime('%Y-%m-%dT%H:%M:%SZ')
+    """ Formats a datetime object into the string format shared by xml and notation serializations."""
+    return v.isoformat() + 'Z'

 def parse_datestr(datestr):
    """Parses a datetime object from the string format shared by xml and notation serializations."""
@@ -186,7 +183,6 @@ class LLSDXMLFormatter(object):
            unicode : self.STRING,
            uri : self.URI,
            datetime.datetime : self.DATE,
-            datetime.date : self.DATE,
            list : self.ARRAY,
            tuple : self.ARRAY,
            types.GeneratorType : self.ARRAY,
@@ -238,7 +234,7 @@ class LLSDXMLFormatter(object):
    def MAP(self, v):
        return self.elt(
            'map',
-            ''.join(["%s%s" % (self.elt('key', self.xml_esc(str(key))), self.generate(value))
+            ''.join(["%s%s" % (self.elt('key', key), self.generate(value))
             for key, value in v.items()]))

    typeof = type
@@ -351,7 +347,6 @@ class LLSDNotationFormatter(object):
            unicode : self.STRING,
            uri : self.URI,
            datetime.datetime : self.DATE,
-            datetime.date : self.DATE,
            list : self.ARRAY,
            tuple : self.ARRAY,
            types.GeneratorType : self.ARRAY,
@@ -929,13 +924,12 @@ def _format_binary_recurse(something):
                (type(something), something))


-def parse_binary(binary):
-    if binary.startswith('<?llsd/binary?>'):
-        just_binary = binary.split('\n', 1)[1]
-    else:
-        just_binary = binary
-    return LLSDBinaryParser().parse(just_binary)
-
+def parse_binary(something):
+    header = '<?llsd/binary?>\n'
+    if not something.startswith(header):
+        raise LLSDParseError('LLSD binary encoding header not found')
+    return LLSDBinaryParser().parse(something[len(header):])
+    
 def parse_xml(something):
    try:
        return to_python(fromstring(something)[0])
--- a/indra/lib/python/indra/base/lluuid.py
+++ b/indra/lib/python/indra/base/lluuid.py
@@ -28,12 +28,13 @@ $/LicenseInfo$

 import random, socket, string, time, re
 import uuid
+
+# *HACK: Necessary for python 2.4. Consider replacing this code wart
+# after python >=2.5 has deployed everywhere. 2009-10-05
 try:
-    # Python 2.6
    from hashlib import md5
 except ImportError:
-    # Python 2.5 and earlier
-    from md5 import new as md5
+    from md5 import md5

 def _int2binstr(i,l):
    s=''
@@ -72,7 +73,7 @@ class UUID(object):
    ip = ''
    try:
        ip = socket.gethostbyname(socket.gethostname())
-    except(socket.gaierror, socket.error):
+    except(socket.gaierror):
        # no ip address, so just default to somewhere in 10.x.x.x
        ip = '10'
        for i in range(3):
@@ -163,7 +164,7 @@ class UUID(object):
    def setFromMemoryDump(self, gdb_string):
        """
        We expect to get gdb_string as four hex units. eg:
-        0x147d54db      0xc34b3f1b      0x714f989b      0x0a892fd2
+        0x147d54db		0xc34b3f1b		0x714f989b		0x0a892fd2
        Which will be translated to:
        db547d14-1b3f4bc3-9b984f71-d22f890a
        Returns self.
@@ -187,7 +188,7 @@ class UUID(object):
    def getAsString(self):
        """
        Return a different string representation of the form
-        AAAAAAAA-AAAABBBB-BBBBBBBB-BBCCCCCC  (a 128-bit number in hex)
+        AAAAAAAA-AAAABBBB-BBBBBBBB-BBCCCCCC	 (a 128-bit number in hex)
        where A=network address, B=timestamp, C=random.
        """
        i1 = _binstr2int(self._bits[0:4])
@@ -233,7 +234,7 @@ NULL = UUID()
 def printTranslatedMemory(four_hex_uints):
    """
    We expect to get the string as four hex units. eg:
-    0x147d54db      0xc34b3f1b      0x714f989b      0x0a892fd2
+    0x147d54db		0xc34b3f1b		0x714f989b		0x0a892fd2
    Which will be translated to:
    db547d14-1b3f4bc3-9b984f71-d22f890a
    """
--- a/indra/lib/python/indra/base/metrics.py
+++ b/indra/lib/python/indra/base/metrics.py
@@ -29,93 +29,25 @@ $/LicenseInfo$
 """

 import sys
-try:
-    import syslog
-except ImportError:
-    # Windows
-    import sys
-    class syslog(object):
-        # wrap to a lame syslog for windows
-        _logfp = sys.stderr
-        def syslog(msg):
-            _logfp.write(msg)
-            if not msg.endswith('\n'):
-                _logfp.write('\n')
-        syslog = staticmethod(syslog)
+from indra.base import llsd

-from indra.base.llsd import format_notation
-
-def record_metrics(table, stats):
-    "Write a standard metrics log"
-    _log("LLMETRICS", table, stats)
-
-def record_event(table, data):
-    "Write a standard logmessage log"
-    _log("LLLOGMESSAGE", table, data)
-
-def set_destination(dest):
-    """Set the destination of metrics logs for this process.
-
-    If you do not call this function prior to calling a logging
-    method, that function will open sys.stdout as a destination.
-    Attempts to set dest to None will throw a RuntimeError.
-    @param dest a file-like object which will be the destination for logs."""
-    if dest is None:
-        raise RuntimeError("Attempt to unset metrics destination.")
-    global _destination
-    _destination = dest
-
-def destination():
-    """Get the destination of the metrics logs for this process.
-    Returns None if no destination is set"""
-    global _destination
-    return _destination
-
-class SysLogger(object):
-    "A file-like object which writes to syslog."
-    def __init__(self, ident='indra', logopt = None, facility = None):
-        try:
-            if logopt is None:
-                logopt = syslog.LOG_CONS | syslog.LOG_PID
-            if facility is None:
-                facility = syslog.LOG_LOCAL0
-            syslog.openlog(ident, logopt, facility)
-            import atexit
-            atexit.register(syslog.closelog)
-        except AttributeError:
-            # No syslog module on Windows
-            pass
-
-    def write(str):
-        syslog.syslog(str)
-    write = staticmethod(write)
-
-    def flush():
-        pass
-    flush = staticmethod(flush)
-
-#
-# internal API
-#
 _sequence_id = 0
-_destination = None

-def _next_id():
+def record_metrics(table, stats, dest=None):
+    "Write a standard metrics log"
+    _log("LLMETRICS", table, stats, dest)
+
+def record_event(table, data, dest=None):
+    "Write a standard logmessage log"
+    _log("LLLOGMESSAGE", table, data, dest)
+
+def _log(header, table, data, dest):
+    if dest is None:
+        # do this check here in case sys.stdout changes at some
+        # point. as a default parameter, it will never be
+        # re-evaluated.
+        dest = sys.stdout
    global _sequence_id
-    next = _sequence_id
+    print >>dest, header, "(" + str(_sequence_id) + ")",
+    print >>dest, table, llsd.format_notation(data)
    _sequence_id += 1
-    return next
-
-def _dest():
-    global _destination
-    if _destination is None:
-        # this default behavior is documented in the metrics functions above.
-        _destination = sys.stdout
-    return _destination
-    
-def _log(header, table, data):
-    log_line = "%s (%d) %s %s" \
-               % (header, _next_id(), table, format_notation(data))
-    dest = _dest()
-    dest.write(log_line)
-    dest.flush()
--- a/indra/lib/python/indra/ipc/httputil.py
+++ b/indra/lib/python/indra/ipc/httputil.py
@@ -1,24 +1,3 @@
-#!/usr/bin/python
-## $LicenseInfo:firstyear=2011&license=viewerlgpl$
-## Second Life Viewer Source Code
-## Copyright (C) 2011, Linden Research, Inc.
-## 
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## version 2.1 of the License only.
-## 
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-## 
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-## 
-## Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-## $/LicenseInfo$

 import warnings

--- a/indra/lib/python/indra/ipc/servicebuilder.py
+++ b/indra/lib/python/indra/ipc/servicebuilder.py
@@ -39,12 +39,6 @@ except:
    pass

 _g_builder = None
-def _builder():
-    global _g_builder
-    if _g_builder is None:
-        _g_builder = ServiceBuilder()
-    return _g_builder
-
 def build(name, context={}, **kwargs):
    """ Convenience method for using a global, singleton, service builder.  Pass arguments either via a dict or via python keyword arguments, or both!

@@ -62,11 +56,6 @@ def build(name, context={}, **kwargs):
        _g_builder = ServiceBuilder()
    return _g_builder.buildServiceURL(name, context, **kwargs)

-def build_path(name, context={}, **kwargs):
-    context = context.copy()  # shouldn't modify the caller's dictionary
-    context.update(kwargs)
-    return _builder().buildPath(name, context)
-
 class ServiceBuilder(object):
    def __init__(self, services_definition = services_config):
        """\
@@ -84,21 +73,12 @@ class ServiceBuilder(object):
                continue
            if isinstance(service_builder, dict):
                # We will be constructing several builders
-                for name, builder in service_builder.iteritems():
+                for name, builder in service_builder.items():
                    full_builder_name = service['name'] + '-' + name
                    self.builders[full_builder_name] = builder
            else:
                self.builders[service['name']] = service_builder

-    def buildPath(self, name, context):
-        """\
-        @brief given the environment on construction, return a service path.
-        @param name The name of the service.
-        @param context A dict of name value lookups for the service.
-        @returns Returns the 
-        """
-        return russ.format(self.builders[name], context)
-
    def buildServiceURL(self, name, context={}, **kwargs):
        """\
        @brief given the environment on construction, return a service URL.
@@ -128,7 +108,7 @@ def on_in(query_name, host_key, schema_key):
    @param schema_key Logical name of destination schema.  Will
        be looked up in indra.xml.
    """
-    return "on/config:%s/in/config:%s/%s" % (host_key.strip('/'),
-                                             schema_key.strip('/'),
-                                             query_name.lstrip('/'))
+    host_name = config.get(host_key)
+    schema_name = config.get(schema_key)
+    return '/'.join( ('on', host_name, 'in', schema_name, query_name.lstrip('/')) )

--- a/indra/lib/python/indra/ipc/siesta.py
+++ b/indra/lib/python/indra/ipc/siesta.py
@@ -1,32 +1,3 @@
-"""\
-@file siesta.py
-@brief A tiny llsd based RESTful web services framework
-
-$LicenseInfo:firstyear=2008&license=mit$
-
-Copyright (c) 2008, Linden Research, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-$/LicenseInfo$
-"""
-
-from indra.base import config
 from indra.base import llsd
 from webob import exc
 import webob
@@ -66,11 +37,11 @@ def mime_type(content_type):
    return content_type.split(';', 1)[0].strip().lower()
    
 class BodyLLSD(object):
-    '''Give a webob Request or Response an llsd based "content" property.
+    '''Give a webob Request or Response an llsd property.

-    Getting the content property parses the body, and caches the result.
+    Getting the llsd property parses the body, and caches the result.

-    Setting the content property formats a payload, and the body property
+    Setting the llsd property formats a payload, and the body property
    is set.'''

    def _llsd__get(self):
@@ -109,7 +80,7 @@ class BodyLLSD(object):
        if hasattr(self, '_llsd'):
            del self._llsd

-    content = property(_llsd__get, _llsd__set, _llsd__del)
+    llsd = property(_llsd__get, _llsd__set, _llsd__del)


 class Response(webob.Response, BodyLLSD):
@@ -143,10 +114,10 @@ class Request(webob.Request, BodyLLSD):

    Sensible content type and accept headers are used by default.

-    Setting the content property also sets the body. Getting the content
+    Setting the llsd property also sets the body.  Getting the llsd
    property parses the body if necessary.

-    If you set the body property directly, the content property will be
+    If you set the body property directly, the llsd property will be
    deleted.'''
    
    default_content_type = 'application/llsd+xml'
@@ -178,11 +149,11 @@ class Request(webob.Request, BodyLLSD):
    body = property(webob.Request._body__get, _body__set,
                    webob.Request._body__del, webob.Request._body__get.__doc__)

-    def create_response(self, content=None, status='200 OK',
+    def create_response(self, llsd=None, status='200 OK',
                        conditional_response=webob.NoDefault):
        resp = self.ResponseClass(status=status, request=self,
                                  conditional_response=conditional_response)
-        resp.content = content
+        resp.llsd = llsd
        return resp

    def curl(self):
@@ -225,18 +196,12 @@ llsd_formatters = {
    'application/xml': llsd.format_xml,
    }

-formatter_qualities = (
-    ('application/llsd+xml', 1.0),
-    ('application/llsd+notation', 0.5),
-    ('application/llsd+binary', 0.4),
-    ('application/xml', 0.3),
-    ('application/json', 0.2),
-    )

 def formatter_for_mime_type(mime_type):
    '''Return a formatter that encodes to the given MIME type.

    The result is a pair of function and MIME type.'''
+
    try:
        return llsd_formatters[mime_type], mime_type
    except KeyError:
@@ -249,19 +214,21 @@ def formatter_for_request(req):
    '''Return a formatter that encodes to the preferred type of the client.

    The result is a pair of function and actual MIME type.'''
-    ctype = req.accept.best_match(formatter_qualities)
-    try:
-        return llsd_formatters[ctype], ctype
-    except KeyError:
+
+    for ctype in req.accept.best_matches('application/llsd+xml'):
+        try:
+            return llsd_formatters[ctype], ctype
+        except KeyError:
+            pass
+    else:
        raise exc.HTTPNotAcceptable().exception


 def wsgi_adapter(func, environ, start_response):
    '''Adapt a Siesta callable to act as a WSGI application.'''
-    # Process the request as appropriate.
+
    try:
        req = Request(environ)
-        #print req.urlvars
        resp = func(req, **req.urlvars)
        if not isinstance(resp, webob.Response):
            try:
@@ -314,8 +281,7 @@ def llsd_class(cls):
            allowed = [m for m in http11_methods
                       if hasattr(instance, 'handle_' + m.lower())]
            raise exc.HTTPMethodNotAllowed(
-                headers={'Allow': ', '.join(allowed)}).exception
-        #print "kwargs: ", kwargs
+                headers={'Allowed': ', '.join(allowed)}).exception
        return handler(req, **kwargs)

    def replacement(environ, start_response):
@@ -370,7 +336,7 @@ def curl(reqs):

 route_re = re.compile(r'''
    \{                 # exact character "{"
-    (\w*)              # "config" or variable (restricted to a-z, 0-9, _)
+    (\w+)              # variable name (restricted to a-z, 0-9, _)
    (?:([:~])([^}]+))? # optional :type or ~regex part
    \}                 # exact character "}"
    ''', re.VERBOSE)
@@ -378,37 +344,27 @@ route_re = re.compile(r'''
 predefined_regexps = {
    'uuid': r'[a-f0-9][a-f0-9-]{31,35}',
    'int': r'\d+',
-    'host': r'[a-z0-9][a-z0-9\-\.]*',
    }

 def compile_route(route):
    fp = StringIO()
    last_pos = 0
    for match in route_re.finditer(route):
-        #print "matches: ", match.groups()
        fp.write(re.escape(route[last_pos:match.start()]))
        var_name = match.group(1)
        sep = match.group(2)
        expr = match.group(3)
-        if var_name == 'config':
-            expr = re.escape(str(config.get(var_name)))
+        if expr:
+            if sep == ':':
+                expr = predefined_regexps[expr]
+            # otherwise, treat what follows '~' as a regexp
        else:
-            if expr:
-                if sep == ':':
-                    expr = predefined_regexps[expr]
-                # otherwise, treat what follows '~' as a regexp
-            else:
-                expr = '[^/]+'
-            if var_name != '':
-                expr = '(?P<%s>%s)' % (var_name, expr)
-            else:
-                expr = '(%s)' % (expr,)
+            expr = '[^/]+'
+        expr = '(?P<%s>%s)' % (var_name, expr)
        fp.write(expr)
        last_pos = match.end()
    fp.write(re.escape(route[last_pos:]))
-    compiled_route = '^%s$' % fp.getvalue()
-    #print route, "->", compiled_route
-    return compiled_route
+    return '^%s$' % fp.getvalue()

 class Router(object):
    '''WSGI routing class.  Parses a URL and hands off a request to
@@ -416,43 +372,21 @@ class Router(object):
    responds with a 404.'''

    def __init__(self):
-        self._new_routes = []
-        self._routes = []
-        self._paths = []
+        self.routes = []
+        self.paths = []

    def add(self, route, app, methods=None):
-        self._new_routes.append((route, app, methods))
-
-    def _create_routes(self):
-        for route, app, methods in self._new_routes:
-            self._paths.append(route)
-            self._routes.append(
-                (re.compile(compile_route(route)),
-                 app,
-                 methods and dict.fromkeys(methods)))
-        self._new_routes = []
+        self.paths.append(route)
+        self.routes.append((re.compile(compile_route(route)), app,
+                            methods and dict.fromkeys(methods)))

    def __call__(self, environ, start_response):
-        # load up the config from the config file. Only needs to be
-        # done once per interpreter. This is the entry point of all
-        # siesta applications, so this is where we trap it.
-        _conf = config.get_config()
-        if _conf is None:
-            import os.path
-            fname = os.path.join(
-                environ.get('ll.config_dir', '/local/linden/etc'),
-                'indra.xml')
-            config.load(fname)
-
-        # proceed with handling the request
-        self._create_routes()
        path_info = environ['PATH_INFO']
        request_method = environ['REQUEST_METHOD']
        allowed = []
-        for regex, app, methods in self._routes:
+        for regex, app, methods in self.routes:
            m = regex.match(path_info)
            if m:
-                #print "groupdict:",m.groupdict()
                if not methods or request_method in methods:
                    environ['paste.urlvars'] = m.groupdict()
                    return app(environ, start_response)
@@ -462,7 +396,7 @@ class Router(object):
            allowed = dict.fromkeys(allows).keys()
            allowed.sort()
            resp = exc.HTTPMethodNotAllowed(
-                headers={'Allow': ', '.join(allowed)})
+                headers={'Allowed': ', '.join(allowed)})
        else:
            resp = exc.HTTPNotFound()
        return resp(environ, start_response)
--- a/indra/lib/python/indra/ipc/siesta_test.py
+++ b/indra/lib/python/indra/ipc/siesta_test.py
@@ -1,24 +1,3 @@
-#!/usr/bin/python
-## $LicenseInfo:firstyear=2011&license=viewerlgpl$
-## Second Life Viewer Source Code
-## Copyright (C) 2011, Linden Research, Inc.
-## 
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## version 2.1 of the License only.
-## 
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-## 
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-## 
-## Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-## $/LicenseInfo$
 from indra.base import llsd, lluuid
 from indra.ipc import siesta
 import datetime, math, unittest
--- a/indra/lib/python/indra/util/fastest_elementtree.py
+++ b/indra/lib/python/indra/util/fastest_elementtree.py
@@ -36,6 +36,7 @@ $/LicenseInfo$

 # Using cElementTree might cause some unforeseen problems, so here's a
 # convenient off switch.
+
 use_celementree = True

 try:
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -41,14 +41,6 @@ import tarfile
 import errno
 import subprocess

-class ManifestError(RuntimeError):
-    """Use an exception more specific than generic Python RuntimeError"""
-    pass
-
-class MissingError(ManifestError):
-    """You specified a file that doesn't exist"""
-    pass
-
 def path_ancestors(path):
    drive, path = os.path.splitdrive(os.path.normpath(path))
    result = []
@@ -84,9 +76,31 @@ def get_default_platform(dummy):
            'darwin':'darwin'
            }[sys.platform]

+def get_default_version(srctree):
+    # look up llversion.h and parse out the version info
+    paths = [os.path.join(srctree, x, 'llversionviewer.h') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']]
+    for p in paths:
+        if os.path.exists(p):
+            contents = open(p, 'r').read()
+            major = re.search("LL_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1)
+            minor = re.search("LL_VERSION_MINOR\s=\s([0-9]+)", contents).group(1)
+            patch = re.search("LL_VERSION_PATCH\s=\s([0-9]+)", contents).group(1)
+            build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1)
+            return major, minor, patch, build
+
+def get_channel(srctree):
+    # look up llversionserver.h and parse out the version info
+    paths = [os.path.join(srctree, x, 'llversionviewer.h') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']]
+    for p in paths:
+        if os.path.exists(p):
+            contents = open(p, 'r').read()
+            channel = re.search("LL_CHANNEL\s=\s\"(.+)\";\s*$", contents, flags = re.M).group(1)
+            return channel
+    
+
 DEFAULT_SRCTREE = os.path.dirname(sys.argv[0])
-CHANNEL_VENDOR_BASE = 'Singularity'
-RELEASE_CHANNEL = CHANNEL_VENDOR_BASE + ' Release'
+DEFAULT_CHANNEL = 'Second Life Release'
+DEFAULT_CHANNEL_SNOWGLOBE = 'Snowglobe Release'

 ARGUMENTS=[
    dict(name='actions',
@@ -107,19 +121,27 @@ ARGUMENTS=[
        On Linux this would try to use Linux_i686Manifest.""",
         default=""),
    dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE),
-    dict(name='buildtype', description='Build type (i.e. Debug, Release, RelWithDebInfo).', default=None),
-    dict(name='configuration',
-         description="""The build configuration used.""",
+    dict(name='buildtype', description="""The build type used. ('Debug', 'Release', or 'RelWithDebInfo')
+        Default is Release """,
         default="Release"),
+    dict(name='branding_id', description="""Identifier for the branding set to 
+        use.  Currently, 'secondlife' or 'snowglobe')""", 
+         default='secondlife'),
+    dict(name='configuration',
+         description="""The build configuration used. Only used on OS X for
+        now, but it could be used for other platforms as well.""",
+         default="Universal"),
    dict(name='dest', description='Destination directory.', default=DEFAULT_SRCTREE),
    dict(name='grid',
-         description="""Which grid the client will try to connect to.""",
-         default=None),
+         description="""Which grid the client will try to connect to. Even
+        though it's not strictly a grid, 'firstlook' is also an acceptable
+        value for this parameter.""",
+         default=""),
    dict(name='channel',
         description="""The channel to use for updates, packaging, settings name, etc.""",
-         default='CHANNEL UNSET'),
-    dict(name='channel_suffix',
-         description="""Addition to the channel for packaging and channel value, but not application name (used internally)""",
+         default=get_channel),
+    dict(name='login_channel',
+         description="""The channel to use for login handshake/updates only.""",
         default=None),
    dict(name='installer_name',
         description=""" The name of the file that the installer should be
@@ -144,12 +166,12 @@ ARGUMENTS=[
        contain the name of the final package in a form suitable
        for use by a .bat file.""",
         default=None),
-    dict(name='versionfile',
-         description="""The name of a file containing the full version number."""),
-    dict(name='signature',
-         description="""This specifies an identity to sign the viewer with, if any.
-        If no value is supplied, the default signature will be used, if any. Currently
-        only used on Mac OS X.""",
+    dict(name='version',
+         description="""This specifies the version of Second Life that is
+        being packaged up.""",
+         default=get_default_version),
+    dict(name='extra_libraries',
+         description="""List of extra libraries to include in package""",
         default=None)
    ]

@@ -171,9 +193,8 @@ def usage(srctree=""):
            arg['description'] % nd)

 def main():
-##  import itertools
-##  print ' '.join((("'%s'" % item) if ' ' in item else item)
-##                 for item in itertools.chain([sys.executable], sys.argv))
+    print "cwd:", os.getcwd()
+    print " ".join(sys.argv)
    option_names = [arg['name'] + '=' for arg in ARGUMENTS]
    option_names.append('help')
    options, remainder = getopt.getopt(sys.argv[1:], "", option_names)
@@ -210,17 +231,12 @@ def main():
                args[arg['name']] = default

    # fix up version
-    if isinstance(args.get('versionfile'), str):
-        try: # read in the version string
-            vf = open(args['versionfile'], 'r')
-            args['version'] = vf.read().strip().split('.')
-        except:
-            print "Unable to read versionfile '%s'" % args['versionfile']
-            raise
-
-    # unspecified, default, and agni are default
-    if args['grid'] in ['', 'default', 'agni']:
-        args['grid'] = None
+    if isinstance(args.get('version'), str):
+        args['version'] = args['version'].split('.')
+        
+    # default and agni are default
+    if args['grid'] in ['default', 'agni']:
+        args['grid'] = ''

    if 'actions' in args:
        args['actions'] = args['actions'].split()
@@ -229,101 +245,15 @@ def main():
    for opt in args:
        print "Option:", opt, "=", args[opt]

-    # pass in sourceid as an argument now instead of an environment variable
-    try:
-        args['sourceid'] = os.environ["sourceid"]
-    except KeyError:
-        args['sourceid'] = ""
-
-    # Build base package.
-    touch = args.get('touch')
-    if touch:
-        print 'Creating base package'
-    args['package_id'] = "" # base package has no package ID
    wm = LLManifest.for_platform(args['platform'], args.get('arch'))(args)
    wm.do(*args['actions'])
-    # Store package file for later if making touched file.
-    base_package_file = ""
-    if touch:
-        print 'Created base package ', wm.package_file
-        base_package_file = "" + wm.package_file

-    # handle multiple packages if set
-    try:
-        additional_packages = os.environ["additional_packages"]
-    except KeyError:
-        additional_packages = ""
-    if additional_packages:
-        # Determine destination prefix / suffix for additional packages.
-        base_dest_postfix = args['dest']
-        base_dest_prefix = ""
-        base_dest_parts = args['dest'].split(os.sep)
-        if len(base_dest_parts) > 1:
-            base_dest_postfix = base_dest_parts[len(base_dest_parts) - 1]
-            base_dest_prefix = base_dest_parts[0]
-            i = 1
-            while i < len(base_dest_parts) - 1:
-                base_dest_prefix = base_dest_prefix + os.sep + base_dest_parts[i]
-                i = i + 1
-        # Determine touched prefix / suffix for additional packages.
-        base_touch_postfix = ""
-        base_touch_prefix = ""
-        if touch:
-            base_touch_postfix = touch
-            base_touch_parts = touch.split('/')
-            if "arwin" in args['platform']:
-                if len(base_touch_parts) > 1:
-                    base_touch_postfix = base_touch_parts[len(base_touch_parts) - 1]
-                    base_touch_prefix = base_touch_parts[0]
-                    i = 1
-                    while i < len(base_touch_parts) - 1:
-                        base_touch_prefix = base_touch_prefix + '/' + base_touch_parts[i]
-                        i = i + 1
-            else:
-                if len(base_touch_parts) > 2:
-                    base_touch_postfix = base_touch_parts[len(base_touch_parts) - 2] + '/' + base_touch_parts[len(base_touch_parts) - 1]
-                    base_touch_prefix = base_touch_parts[0]
-                    i = 1
-                    while i < len(base_touch_parts) - 2:
-                        base_touch_prefix = base_touch_prefix + '/' + base_touch_parts[i]
-                        i = i + 1
-        # Store base channel name.
-        base_channel_name = args['channel']
-        # Build each additional package.
-        package_id_list = additional_packages.split(" ")
-        args['channel'] = base_channel_name
-        for package_id in package_id_list:
-            try:
-                if package_id + "_viewer_channel_suffix" in os.environ:
-                    args['channel_suffix'] = os.environ[package_id + "_viewer_channel_suffix"]
-                else:
-                    args['channel_suffix'] = None
-                if package_id + "_sourceid" in os.environ:
-                    args['sourceid'] = os.environ[package_id + "_sourceid"]
-                else:
-                    args['sourceid'] = None
-                args['dest'] = base_dest_prefix + os.sep + package_id + os.sep + base_dest_postfix
-            except KeyError:
-                sys.stderr.write("Failed to create package for package_id: %s" % package_id)
-                sys.stderr.flush()
-                continue
-            if touch:
-                print 'Creating additional package for "', package_id, '" in ', args['dest']
-            wm = LLManifest.for_platform(args['platform'], args.get('arch'))(args)
-            wm.do(*args['actions'])
-            if touch:
-                print 'Created additional package ', wm.package_file, ' for ', package_id
-                faketouch = base_touch_prefix + '/' + package_id + '/' + base_touch_postfix
-                fp = open(faketouch, 'w')
-                fp.write('set package_file=%s\n' % wm.package_file)
-                fp.close()
-    
    # Write out the package file in this format, so that it can easily be called
    # and used in a .bat file - yeah, it sucks, but this is the simplest...
    touch = args.get('touch')
    if touch:
        fp = open(touch, 'w')
-        fp.write('set package_file=%s\n' % base_package_file)
+        fp.write('set package_file=%s\n' % wm.package_file)
        fp.close()
        print 'touched', touch
    return 0
@@ -339,8 +269,8 @@ class LLManifest(object):
    __metaclass__ = LLManifestRegistry
    manifests = {}
    def for_platform(self, platform, arch = None):
-        if arch:
-            platform = platform + '_' + arch + '_'
+        if arch and platform != "windows":
+            platform = platform + '_' + arch
        return self.manifests[platform.lower()]
    for_platform = classmethod(for_platform)

@@ -357,8 +287,18 @@ class LLManifest(object):
        self.created_paths = []
        self.package_name = "Unknown"
        
+    def default_grid(self):
+        return self.args.get('grid', None) == ''
    def default_channel(self):
-        return self.args.get('channel', None) == RELEASE_CHANNEL
+        return self.args.get('channel', None) == DEFAULT_CHANNEL
+    
+    def default_channel_for_brand(self):
+        if self.viewer_branding_id()=='secondlife':
+            return self.args.get('channel', None) == DEFAULT_CHANNEL
+        elif self.viewer_branding_id()=="snowglobe":
+            return self.args.get('channel', None) == DEFAULT_CHANNEL_SNOWGLOBE
+        else:
+            return True

    def construct(self):
        """ Meant to be overriden by LLManifest implementors with code that
@@ -450,27 +390,23 @@ class LLManifest(object):

    def run_command(self, command):
        """ Runs an external command, and returns the output.  Raises
-        an exception if the command returns a nonzero status code.  For
-        debugging/informational purposes, prints out the command's
+        an exception if the command reurns a nonzero status code.  For
+        debugging/informational purpoases, prints out the command's
        output as it is received."""
        print "Running command:", command
-        sys.stdout.flush()
-        child = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-                                 shell=True)
+        fd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
        lines = []
        while True:
-            lines.append(child.stdout.readline())
+            lines.append(fd.stdout.readline())
            if lines[-1] == '':
                break
            else:
-                print lines[-1],
+                print lines[-1].rstrip('\n'),
        output = ''.join(lines)
-        child.stdout.close()
-        status = child.wait()
-        if status:
-            raise ManifestError(
+        if fd.returncode:
+            raise RuntimeError(
                "Command %s returned non-zero status (%s) \noutput:\n%s"
-                % (command, status, output) )
+                % (command, fd.returncode, output) )
        return output

    def created_path(self, path):
@@ -478,24 +414,14 @@ class LLManifest(object):
          a) verify that you really have created it
          b) schedule it for cleanup"""
        if not os.path.exists(path):
-            raise ManifestError, "Should be something at path " + path
+            raise RuntimeError, "Should be something at path " + path
        self.created_paths.append(path)

-    def put_in_file(self, contents, dst, src=None):
+    def put_in_file(self, contents, dst):
        # write contents as dst
-        dst_path = self.dst_path_of(dst)
-        f = open(dst_path, "wb")
-        try:
-            f.write(contents)
-        finally:
-            f.close()
-
-        # Why would we create a file in the destination tree if not to include
-        # it in the installer? The default src=None (plus the fact that the
-        # src param is last) is to preserve backwards compatibility.
-        if src:
-            self.file_list.append([src, dst_path])
-        return dst_path
+        f = open(self.dst_path_of(dst), "wb")
+        f.write(contents)
+        f.close()

    def replace_in(self, src, dst=None, searchdict={}):
        if dst == None:
@@ -515,7 +441,11 @@ class LLManifest(object):
            # ensure that destination path exists
            self.cmakedirs(os.path.dirname(dst))
            self.created_paths.append(dst)
-            self.ccopymumble(src, dst)
+            if not os.path.isdir(src):
+                self.ccopy(src,dst)
+            else:
+                # src is a dir
+                self.ccopytree(src,dst)
        else:
            print "Doesn't exist:", src

@@ -594,38 +524,28 @@ class LLManifest(object):
                else:
                    os.remove(path)

-    def ccopymumble(self, src, dst):
-        """Copy a single symlink, file or directory."""
+    def ccopy(self, src, dst):
+        """ Copy a single file or symlink.  Uses filecmp to skip copying for existing files."""
        if os.path.islink(src):
            linkto = os.readlink(src)
-            if os.path.islink(dst) or os.path.isfile(dst):
+            if os.path.islink(dst) or os.path.exists(dst):
                os.remove(dst)  # because symlinking over an existing link fails
-            elif os.path.isdir(dst):
-                shutil.rmtree(dst)
            os.symlink(linkto, dst)
-        elif os.path.isdir(src):
-            self.ccopytree(src, dst)
        else:
-            self.ccopyfile(src, dst)
-            # XXX What about devices, sockets etc.?
-            # YYY would we put such things into a viewer package?!
+            # Don't recopy file if it's up-to-date.
+            # If we seem to be not not overwriting files that have been
+            # updated, set the last arg to False, but it will take longer.
+            if os.path.exists(dst) and filecmp.cmp(src, dst, True):
+                return
+            # only copy if it's not excluded
+            if self.includes(src, dst):
+                try:
+                    os.unlink(dst)
+                except OSError, err:
+                    if err.errno != errno.ENOENT:
+                        raise

-    def ccopyfile(self, src, dst):
-        """ Copy a single file.  Uses filecmp to skip copying for existing files."""
-        # Don't recopy file if it's up-to-date.
-        # If we seem to be not not overwriting files that have been
-        # updated, set the last arg to False, but it will take longer.
-        if os.path.exists(dst) and filecmp.cmp(src, dst, True):
-            return
-        # only copy if it's not excluded
-        if self.includes(src, dst):
-            try:
-                os.unlink(dst)
-            except OSError, err:
-                if err.errno != errno.ENOENT:
-                    raise
-
-            shutil.copy2(src, dst)
+                shutil.copy2(src, dst)

    def ccopytree(self, src, dst):
        """Direct copy of shutil.copytree with the additional
@@ -641,11 +561,15 @@ class LLManifest(object):
            srcname = os.path.join(src, name)
            dstname = os.path.join(dst, name)
            try:
-                self.ccopymumble(srcname, dstname)
+                if os.path.isdir(srcname):
+                    self.ccopytree(srcname, dstname)
+                else:
+                    self.ccopy(srcname, dstname)
+                    # XXX What about devices, sockets etc.?
            except (IOError, os.error), why:
                errors.append((srcname, dstname, why))
        if errors:
-            raise ManifestError, errors
+            raise RuntimeError, errors


    def cmakedirs(self, path):
@@ -693,10 +617,11 @@ class LLManifest(object):

    def check_file_exists(self, path):
        if not os.path.exists(path) and not os.path.islink(path):
-            raise MissingError("Path %s doesn't exist" % (os.path.abspath(path),))
+            raise RuntimeError("Path %s doesn't exist" % (
+                os.path.normpath(os.path.join(os.getcwd(), path)),))


-    wildcard_pattern = re.compile(r'\*')
+    wildcard_pattern = re.compile('\*')
    def expand_globs(self, src, dst):
        src_list = glob.glob(src)
        src_re, d_template = self.wildcard_regex(src.replace('\\', '/'),
@@ -705,72 +630,41 @@ class LLManifest(object):
            d = src_re.sub(d_template, s.replace('\\', '/'))
            yield os.path.normpath(s), os.path.normpath(d)

-    def path2basename(self, path, file):
-        """
-        It is a common idiom to write:
-        self.path(os.path.join(somedir, somefile), somefile)
-
-        So instead you can write:
-        self.path2basename(somedir, somefile)
-
-        Note that this is NOT the same as:
-        self.path(os.path.join(somedir, somefile))
-
-        which is the same as:
-        temppath = os.path.join(somedir, somefile)
-        self.path(temppath, temppath)
-        """
-        return self.path(os.path.join(path, file), file)
-
    def path(self, src, dst=None):
        sys.stdout.write("Processing %s => %s ... " % (src, dst))
        sys.stdout.flush()
        if src == None:
-            raise ManifestError("No source file, dst is " + dst)
+            raise RuntimeError("No source file, dst is " + dst)
        if dst == None:
            dst = src
        dst = os.path.join(self.get_dst_prefix(), dst)
+        count = 0
+        is_glob = False

-        def try_path(src):
-            # expand globs
-            count = 0
-            if self.wildcard_pattern.search(src):
-                for s,d in self.expand_globs(src, dst):
+        # look under each prefix for matching paths
+        paths = set([os.path.join(self.get_src_prefix(), src),
+                 os.path.join(self.get_artwork_prefix(), src),
+                 os.path.join(self.get_build_prefix(), src)])
+        for path in paths:
+            if self.wildcard_pattern.search(path):
+                is_glob = True
+                for s,d in self.expand_globs(path, dst):
                    assert(s != d)
                    count += self.process_file(s, d)
            else:
-                # if we're specifying a single path (not a glob),
-                # we should error out if it doesn't exist
-                self.check_file_exists(src)
                # if it's a directory, recurse through it
-                if os.path.isdir(src):
-                    count += self.process_directory(src, dst)
-                else:
-                    count += self.process_file(src, dst)
-            return count
+                if os.path.isdir(path):
+                    count += self.process_directory(path, dst)
+                elif os.path.exists(path):
+                    count += self.process_file(path, dst)

-        for pfx in self.get_src_prefix(), self.get_artwork_prefix(), self.get_build_prefix():
-            try:
-                count = try_path(os.path.join(pfx, src))
-            except MissingError:
-                # If src isn't a wildcard, and if that file doesn't exist in
-                # this pfx, try next pfx.
-                count = 0
-                continue
-
-            # Here try_path() didn't raise MissingError. Did it process any files?
-            if count:
-                break
-            # Even though try_path() didn't raise MissingError, it returned 0
-            # files. src is probably a wildcard meant for some other pfx. Loop
-            # back to try the next.
+        # if we're specifying a single path (not a glob),
+        # we should error out if it doesn't exist
+        if count == 0 and not is_glob:
+            raise RuntimeError("No files match %s\n" % str(paths))

        print "%d files" % count

-        # Let caller check whether we processed as many files as expected. In
-        # particular, let caller notice 0.
-        return count
-
    def do(self, *actions):
        self.actions = actions
        self.construct()
--- a/indra/lib/python/indra/util/llperformance.py
+++ b/indra/lib/python/indra/util/llperformance.py
@@ -1,28 +1,4 @@
-#!/usr/bin/env python
-"""\
-@file   llperformance.py
-
-$LicenseInfo:firstyear=2010&license=viewerlgpl$
-Second Life Viewer Source Code
-Copyright (C) 2010-2011, Linden Research, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation;
-version 2.1 of the License only.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-$/LicenseInfo$
-"""
+#!/usr/bin/python

 # ------------------------------------------------
 # Sim metrics utility functions.
--- a/indra/lib/python/indra/util/llsubprocess.py
+++ b/indra/lib/python/indra/util/llsubprocess.py
@@ -90,17 +90,6 @@ all the output, and get the result.
                    child.tochild.close()
        result = child.poll()
        if result != -1:
-            # At this point, the child process has exited and result
-            # is the return value from the process. Between the time
-            # we called select() and poll() the process may have
-            # exited so read all the data left on the child process
-            # stdout and stderr.
-            last = child.fromchild.read()
-            if last:
-                out.append(last)
-            last = child.childerr.read()
-            if last:
-                err.append(last)
            child.tochild.close()
            child.fromchild.close()
            child.childerr.close()
--- a/indra/lib/python/indra/util/llversion.py
+++ b/indra/lib/python/indra/util/llversion.py
@@ -0,0 +1,95 @@
+"""@file llversion.py
+@brief Utility for parsing llcommon/llversion${server}.h
+       for the version string and channel string
+       Utility that parses svn info for branch and revision
+
+$LicenseInfo:firstyear=2006&license=mit$
+
+Copyright (c) 2006-2009, Linden Research, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+$/LicenseInfo$
+"""
+
+import re, sys, os, commands
+
+# Methods for gathering version information from
+# llversionviewer.h and llversionserver.h
+
+def get_src_root():
+    indra_lib_python_indra_path = os.path.dirname(__file__)
+    return os.path.abspath(os.path.realpath(indra_lib_python_indra_path + "/../../../../../"))
+
+def get_version_file_contents(version_type):
+    filepath = get_src_root() + '/indra/llcommon/llversion%s.h' % version_type
+    file = open(filepath,"r")
+    file_str = file.read()
+    file.close()
+    return file_str
+
+def get_version(version_type):
+    file_str = get_version_file_contents(version_type)
+    m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', file_str)
+    VER_MAJOR = m.group(1)
+    m = re.search('const S32 LL_VERSION_MINOR = (\d+);', file_str)
+    VER_MINOR = m.group(1)
+    m = re.search('const S32 LL_VERSION_PATCH = (\d+);', file_str)
+    VER_PATCH = m.group(1)
+    m = re.search('const S32 LL_VERSION_BUILD = (\d+);', file_str)
+    VER_BUILD = m.group(1)
+    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_BUILD)s" % locals()
+    return version
+
+def get_channel(version_type):
+    file_str = get_version_file_contents(version_type)
+    m = re.search('const char \* const LL_CHANNEL = "(.+)";', file_str)
+    return m.group(1)
+    
+def get_viewer_version():
+    return get_version('viewer')
+
+def get_server_version():
+    return get_version('server')
+
+def get_viewer_channel():
+    return get_channel('viewer')
+
+def get_server_channel():
+    return get_channel('server')
+
+# Methods for gathering subversion information
+def get_svn_status_matching(regular_expression):
+    # Get the subversion info from the working source tree
+    status, output = commands.getstatusoutput('svn info %s' % get_src_root())
+    m = regular_expression.search(output)
+    if not m:
+        print "Failed to parse svn info output, resultfollows:"
+        print output
+        raise Exception, "No matching svn status in "+src_root
+    return m.group(1)
+
+def get_svn_branch():
+    branch_re = re.compile('URL: (\S+)')
+    return get_svn_status_matching(branch_re)
+
+def get_svn_revision():
+    last_rev_re = re.compile('Last Changed Rev: (\d+)')
+    return get_svn_status_matching(last_rev_re)
+
+
--- a/indra/lib/python/indra/util/named_query.py
+++ b/indra/lib/python/indra/util/named_query.py
@@ -40,6 +40,7 @@ from indra.base import llsd
 from indra.base import config

 DEBUG = False
+
 NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '.nq')
 NQ_FILE_SUFFIX_LEN  = len(NQ_FILE_SUFFIX)

@@ -51,11 +52,6 @@ def _init_g_named_manager(sql_dir = None):

    This function is intended entirely for testing purposes,
    because it's tricky to control the config from inside a test."""
-    global NQ_FILE_SUFFIX
-    NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '.nq')
-    global NQ_FILE_SUFFIX_LEN
-    NQ_FILE_SUFFIX_LEN  = len(NQ_FILE_SUFFIX)
-
    if sql_dir is None:
        sql_dir = config.get('named-query-base-dir')

@@ -69,11 +65,11 @@ def _init_g_named_manager(sql_dir = None):
    _g_named_manager = NamedQueryManager(
        os.path.abspath(os.path.realpath(sql_dir)))

-def get(name, schema = None):
+def get(name):
    "Get the named query object to be used to perform queries"
    if _g_named_manager is None:
        _init_g_named_manager()
-    return _g_named_manager.get(name).for_schema(schema)
+    return _g_named_manager.get(name)

 def sql(connection, name, params):
    # use module-global NamedQuery object to perform default substitution
@@ -284,10 +280,7 @@ class NamedQuery(object):

        So, we need a vendor (or extention) for LIKE_STRING. Anyone
        want to write it?"""
-        if isinstance(value, unicode):
-            utf8_value = value
-        else:
-            utf8_value = unicode(value, "utf-8")
+        utf8_value = unicode(value, "utf-8")
        esc_list = []
        remove_chars = set(u"%_")
        for glyph in utf8_value:
@@ -324,8 +317,6 @@ class NamedQuery(object):

    def for_schema(self, db_name):
        "Look trough the alternates and return the correct query"
-        if db_name is None:
-            return self
        try:
            return self._alternative[db_name]
        except KeyError, e:
@@ -350,21 +341,21 @@ class NamedQuery(object):
            cursor = connection.cursor(MySQLdb.cursors.DictCursor)
        else:
            cursor = connection.cursor()
-
-        full_query, params = self._construct_sql(params)
+        
+        statement = self.sql(connection, params)
        if DEBUG:
-            print "SQL:", self.sql(connection, params)
-        rows = cursor.execute(full_query, params)
-
+            print "SQL:", statement
+        rows = cursor.execute(statement)
+        
        # *NOTE: the expect_rows argument is a very cheesy way to get some
        # validation on the result set.  If you want to add more expectation
-        # logic, do something more object-oriented and flexible. Or use an ORM.
+        # logic, do something more object-oriented and flexible.  Or use an ORM.
        if(self._return_as_map):
            expect_rows = 1
        if expect_rows is not None and rows != expect_rows:
            cursor.close()
-            raise ExpectationFailed("Statement expected %s rows, got %s.  Sql: '%s' %s" % (
-                expect_rows, rows, full_query, params))
+            raise ExpectationFailed("Statement expected %s rows, got %s.  Sql: %s" % (
+                expect_rows, rows, statement))

        # convert to dicts manually if we're not using a dictcursor
        if use_dictcursor:
@@ -390,9 +381,11 @@ class NamedQuery(object):
            return result_set[0]
        return result_set

-    def _construct_sql(self, params):
-        """ Returns a query string and a dictionary of parameters,
-        suitable for directly passing to the execute() method."""
+    def sql(self, connection, params):
+        """ Generates an SQL statement from the named query document
+        and a dictionary of parameters.
+
+        """
        self.refresh()

        # build the query from the options available and the params
@@ -438,23 +431,10 @@ class NamedQuery(object):
                new_params[self._build_integer_key(key)] = int(params[key])
        params.update(new_params)

-        return full_query, params
-
-    def sql(self, connection, params):
-        """ Generates an SQL statement from the named query document
-        and a dictionary of parameters.
-
-        *NOTE: Only use for debugging, because it uses the
-         non-standard MySQLdb 'literal' method.
-        """
-        if not DEBUG:
-            import warnings
-            warnings.warn("Don't use named_query.sql() when not debugging.  Used on %s" % self._location)
        # do substitution using the mysql (non-standard) 'literal'
        # function to do the escaping.
-        full_query, params = self._construct_sql(params)
-        return full_query % connection.literal(params)
-        
+        sql = full_query % connection.literal(params)
+        return sql

    def refresh(self):
        """ Refresh self from the file on the filesystem.
--- a/indra/lib/python/indra/util/simperf_oprof_interface.py
+++ b/indra/lib/python/indra/util/simperf_oprof_interface.py
@@ -3,27 +3,20 @@
@file simperf_oprof_interface.py
@brief Manage OProfile data collection on a host

-$LicenseInfo:firstyear=2008&license=mit$
+$LicenseInfo:firstyear=2008&license=internal$

 Copyright (c) 2008-2009, Linden Research, Inc.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+this source code is governed by the Linden Lab Source Code Disclosure
+Agreement ("Agreement") previously entered between you and Linden
+Lab. By accessing, using, copying, modifying or distributing this
+software, you acknowledge that you have been informed of your
+obligations under the Agreement and agree to abide by those obligations.

-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+COMPLETENESS OR PERFORMANCE.
 $/LicenseInfo$
 """

--- a/indra/lib/python/indra/util/simperf_proc_interface.py
+++ b/indra/lib/python/indra/util/simperf_proc_interface.py
@@ -1,31 +1,4 @@
-#!/usr/bin/env python
-"""\
-@file simperf_proc_interface.py
-@brief Utility to extract log messages from *.<pid>.llsd files containing performance statistics.
-
-$LicenseInfo:firstyear=2008&license=mit$
-
-Copyright (c) 2008-2009, Linden Research, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-$/LicenseInfo$
-"""
+#!/usr/bin/python

 # ----------------------------------------------------
 # Utility to extract log messages from *.<pid>.llsd
--- a/indra/lib/python/indra/util/test_win32_manifest.py
+++ b/indra/lib/python/indra/util/test_win32_manifest.py
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-"""\
-@file test_win32_manifest.py
-@brief Test an assembly binding version and uniqueness in a windows dll or exe.  
-
-$LicenseInfo:firstyear=2009&license=viewerlgpl$
-Second Life Viewer Source Code
-Copyright (C) 2009-2011, Linden Research, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation;
-version 2.1 of the License only.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-$/LicenseInfo$
-"""
-import sys, os
-import tempfile
-from xml.dom.minidom import parse
-
-class AssemblyTestException(Exception):
-    pass
-
-class NoManifestException(AssemblyTestException):
-    pass
-
-class MultipleBindingsException(AssemblyTestException):
-    pass
-
-class UnexpectedVersionException(AssemblyTestException):
-    pass
-
-class NoMatchingAssemblyException(AssemblyTestException):
-    pass
-
-def get_HKLM_registry_value(key_str, value_str):
-    import _winreg
-    reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-    key = _winreg.OpenKey(reg, key_str)
-    value = _winreg.QueryValueEx(key, value_str)[0]
-    #print 'Found: %s' % value
-    return value
-        
-def find_vc_dir():
-    supported_versions = (r'8.0', r'9.0')
-    supported_products = (r'VisualStudio', r'VCExpress')
-    value_str = (r'ProductDir')
-    
-    for product in supported_products:
-        for version in supported_versions:
-            key_str = (r'SOFTWARE\Microsoft\%s\%s\Setup\VC' %
-                      (product, version))
-            try:
-                return get_HKLM_registry_value(key_str, value_str)
-            except WindowsError, err:
-                x64_key_str = (r'SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%s\Setup\VS' %
-                        version)
-                try:
-                    return get_HKLM_registry_value(x64_key_str, value_str)
-                except:
-                    print >> sys.stderr, "Didn't find MS %s version %s " % (product,version)
-        
-    raise
-
-def find_mt_path():
-    vc_dir = find_vc_dir()
-    mt_path = '\"%sbin\\mt.exe\"' % vc_dir
-    return mt_path
-    
-def test_assembly_binding(src_filename, assembly_name, assembly_ver):
-    print "checking %s dependency %s..." % (src_filename, assembly_name)
-
-    (tmp_file_fd, tmp_file_name) = tempfile.mkstemp(suffix='.xml')
-    tmp_file = os.fdopen(tmp_file_fd)
-    tmp_file.close()
-
-    mt_path = find_mt_path()
-    resource_id = ""
-    if os.path.splitext(src_filename)[1].lower() == ".dll":
-       resource_id = ";#2"
-    system_call = '%s -nologo -inputresource:%s%s -out:%s > NUL' % (mt_path, src_filename, resource_id, tmp_file_name)
-    print "Executing: %s" % system_call
-    mt_result = os.system(system_call)
-    if mt_result == 31:
-        print "No manifest found in %s" % src_filename
-        raise NoManifestException()
-
-    manifest_dom = parse(tmp_file_name)
-    nodes = manifest_dom.getElementsByTagName('assemblyIdentity')
-
-    versions = list()
-    for node in nodes:
-        if node.getAttribute('name') == assembly_name:
-            versions.append(node.getAttribute('version'))
-
-    if len(versions) == 0:
-        print "No matching assemblies found in %s" % src_filename
-        raise NoMatchingAssemblyException()
-        
-    elif len(versions) > 1:
-        print "Multiple bindings to %s found:" % assembly_name
-        print versions
-        print 
-        raise MultipleBindingsException(versions)
-
-    elif versions[0] != assembly_ver:
-        print "Unexpected version found for %s:" % assembly_name
-        print "Wanted %s, found %s" % (assembly_ver, versions[0])
-        print
-        raise UnexpectedVersionException(assembly_ver, versions[0])
-            
-    os.remove(tmp_file_name)
-    
-    print "SUCCESS: %s OK!" % src_filename
-    print
-  
-if __name__ == '__main__':
-
-    print
-    print "Running test_win32_manifest.py..."
-    
-    usage = 'test_win32_manfest <srcFileName> <assemblyName> <assemblyVersion>'
-
-    try:
-        src_filename = sys.argv[1]
-        assembly_name = sys.argv[2]
-        assembly_ver = sys.argv[3]
-    except:
-        print "Usage:"
-        print usage
-        print
-        raise
-    
-    test_assembly_binding(src_filename, assembly_name, assembly_ver)
-
-    
--- a/indra/lib/python/uuid.py
+++ b/indra/lib/python/uuid.py
@@ -1,24 +1,3 @@
-#!/usr/bin/python
-## $LicenseInfo:firstyear=2011&license=viewerlgpl$
-## Second Life Viewer Source Code
-## Copyright (C) 2011, Linden Research, Inc.
-## 
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation;
-## version 2.1 of the License only.
-## 
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-## 
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-## 
-## Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-## $/LicenseInfo$
 r"""UUID objects (universally unique identifiers) according to RFC 4122.

 This module provides immutable UUID objects (class UUID) and the functions
@@ -66,6 +45,13 @@ Typical usage:

 This module works with Python 2.3 or higher."""

+# *HACK: Necessary for python 2.4. Consider replacing this code wart
+# after python >=2.5 has deployed everywhere. 2009-10-05
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
+
 __author__ = 'Ka-Ping Yee <ping@zesty.ca>'
 __date__ = '$Date: 2006/06/12 23:15:40 $'.split()[1].replace('/', '-')
 __version__ = '$Revision: 1.30 $'.split()[1]
@@ -467,13 +453,6 @@ def uuid1(node=None, clock_seq=None):

 def uuid3(namespace, name):
    """Generate a UUID from the MD5 hash of a namespace UUID and a name."""
-    try:
-        # Python 2.6
-        from hashlib import md5
-    except ImportError:
-        # Python 2.5 and earlier
-        from md5 import new as md5
-        
    hash = md5(namespace.bytes + name).digest()
    return UUID(bytes=hash[:16], version=3)

--- a/indra/libhacd/hacdHACD.cpp
+++ b/indra/libhacd/hacdHACD.cpp
@@ -138,11 +138,7 @@ namespace HACD
            if (m_callBack)
            {
                char msg[1024];
-#if _MSC_VER
-                sprintf(msg, "nCC %Iu\n", m_graph.m_nCCs);
-#else
                sprintf(msg, "nCC %zu\n", m_graph.m_nCCs);
-#endif
                (*m_callBack)(msg, 0.0, 0.0,  m_graph.GetNVertices());
                
            }
@@ -683,11 +679,7 @@ namespace HACD
                {
 					if ((!condition1) && m_callBack)
 					{
-#if _MSC_VER
-						sprintf(msg, "\n-> %Iu\t%f\t%f\t%f\n", m_pqueue.size(), m_graph.m_vertices[v1].m_surf*100.0/m_area, m_graph.m_vertices[v2].m_surf*100.0/m_area, m_graph.m_edges[currentEdge.m_name].m_concavity);
-#else
 						sprintf(msg, "\n-> %zu\t%f\t%f\t%f\n", m_pqueue.size(), m_graph.m_vertices[v1].m_surf*100.0/m_area, m_graph.m_vertices[v2].m_surf*100.0/m_area, m_graph.m_edges[currentEdge.m_name].m_concavity);
-#endif
 						(*m_callBack)(msg, progress, globalConcavity,  m_graph.GetNVertices());
 					}
 					globalConcavity = std::max<double>(globalConcavity ,m_graph.m_edges[currentEdge.m_name].m_concavity);
@@ -887,11 +879,7 @@ namespace HACD
                if (m_callBack) 
                {
                    char msg[1024];
-#if _MSC_VER
-                    sprintf(msg, "\t CH(%Iu) \t %Iu \t %lf \t %Iu \t %f \t %Iu\n", v, p, m_graph.m_vertices[v].m_concavity, m_graph.m_vertices[v].m_distPoints.Size(),  m_graph.m_vertices[v].m_surf*100.0/m_area, m_graph.m_vertices[v].m_ancestors.size());
-#else
                    sprintf(msg, "\t CH(%zu) \t %zu \t %lf \t %zu \t %f \t %zu\n", v, p, m_graph.m_vertices[v].m_concavity, m_graph.m_vertices[v].m_distPoints.Size(),  m_graph.m_vertices[v].m_surf*100.0/m_area, m_graph.m_vertices[v].m_ancestors.size());
-#endif
 					(*m_callBack)(msg, 0.0, 0.0, m_nClusters);
 					p++;
                }
@@ -989,8 +977,7 @@ namespace HACD
                    m_convexHulls[p].AddPoint(m_points[point.m_name], point.m_name);
                }
            }
-			if (p < m_nClusters)
-				m_convexHulls[p].SetDistPoints(0); //&m_graph.m_vertices[v].m_distPoints
+			m_convexHulls[p].SetDistPoints(0); //&m_graph.m_vertices[v].m_distPoints
            if (fullCH)
            {
 				while (m_convexHulls[p].Process() == ICHullErrorInconsistent)		// if we face problems when constructing the visual-hull. really ugly!!!!
--- a/indra/libhacd/hacdRaycastMesh.cpp
+++ b/indra/libhacd/hacdRaycastMesh.cpp
@@ -17,10 +17,6 @@
 #include <assert.h>
 #include <limits>
 #include "hacdManifoldMesh.h"
-
-#if _MSC_VER >= 1800
-#include <algorithm>
-#endif
 namespace HACD
 {
 	bool BBox::Raycast(const Vec3<Float> & origin, const Vec3<Float> & dir, Float & distMin) const
--- a/Show More
+++ b/Show More