Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

16 files changed, 268 insertions, 45 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 9b3f423..a443939 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -9,9 +9,9 @@ include(Variables)
 
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
-    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG")
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-    "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+    "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
 
 # Don't bother with a MinSizeRel build.
@@ -26,21 +26,24 @@ if (WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MTd"
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   if (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MT"
+      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD"
       CACHE STRING "C++ compiler release options" FORCE)
   else (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
       CACHE STRING "C++ compiler release options" FORCE)
   endif (MSVC80)
 
+  set(CMAKE_CXX_STANDARD_LIBRARIES "")
+  set(CMAKE_C_STANDARD_LIBRARIES "")
+
   add_definitions(
       /DLL_WINDOWS=1
       /DUNICODE
@@ -159,6 +162,8 @@ if (LINUX)
   if (VIEWER)
     add_definitions(-DAPPID=imprudence)
     add_definitions(-fvisibility=hidden)
+    # 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!  The viewer doesn't need to catch SIGCHLD anyway.
+    add_definitions(-DLL_IGNORE_SIGCHLD)
     if (NOT STANDALONE)
       # this stops us requiring a really recent glibc at runtime
       add_definitions(-fno-stack-protector)
@@ -184,7 +189,7 @@ endif (DARWIN)
 
 
 if (LINUX OR DARWIN)
-  set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
+  set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor")
 
   if (NOT GCC_DISABLE_FATAL_WARNINGS)
     set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index 088b3e6..e9f6411 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -1,5 +1,3 @@
-# -*- cmake -*-
-
 include(BerkeleyDB)
 include(Linking)
 include(Prebuilt)
@@ -19,16 +17,16 @@ else (STANDALONE)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
       )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
-      )
     set(APRICONV_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
       )
     # Doesn't need to link with iconv.dll
     set(APRICONV_LIBRARIES "")
+    set(APRUTIL_LIBRARIES 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
+      )
   elseif (DARWIN)
     set(APR_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
diff --git a/linden/indra/cmake/Audio.cmake b/linden/indra/cmake/Audio.cmake
index c6ccab2..d23bc2f 100644
--- a/linden/indra/cmake/Audio.cmake
+++ b/linden/indra/cmake/Audio.cmake
@@ -14,10 +14,18 @@ else (STANDALONE)
   set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
 
   if (WINDOWS)
-    set(OGG_LIBRARIES ogg_static_mt)
-    set(VORBIS_LIBRARIES vorbis_static_mt)
-    set(VORBISENC_LIBRARIES vorbisenc_static_mt)
-    set(VORBISFILE_LIBRARIES vorbisfile_static_mt)
+    set(OGG_LIBRARIES
+        optimized ogg_static
+        debug ogg_static_d)
+    set(VORBIS_LIBRARIES
+        optimized vorbis_static
+        debug vorbis_static_d)
+    set(VORBISENC_LIBRARIES
+        optimized vorbisenc_static
+        debug vorbisenc_static_d)
+    set(VORBISFILE_LIBRARIES
+        optimized vorbisfile_static
+        debug vorbisfile_static_d)
   else (WINDOWS)
     set(OGG_LIBRARIES ogg)
     set(VORBIS_LIBRARIES vorbis)
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index a7db67c..50b8eff 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -15,27 +15,37 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_34_1)
+    set(BOOST_VERSION 1_36)
     if (MSVC71)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
+          optimized libboost_program_options-vc71-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION})
       set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
+          optimized libboost_regex-vc71-mt-${BOOST_VERSION}
+          debug libboost_regex-vc71-mt-gd-${BOOST_VERSION})
       set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
-    else (MSVC71)
+          optimized libboost_signals-vc71-mt-${BOOST_VERSION}
+          debug libboost_signals-vc71-mt-gd-${BOOST_VERSION})
+    elseif (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc80-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc80-mt-sgd-${BOOST_VERSION})
+          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
       set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc80-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc80-mt-sgd-${BOOST_VERSION})
+          optimized libboost_regex-vc80-mt-${BOOST_VERSION}
+          debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
       set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc80-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc80-mt-sgd-${BOOST_VERSION})
+          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
+          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
+    elseif (MSVC90)
+      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+          optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION})
+      set(BOOST_REGEX_LIBRARY
+          optimized libboost_regex-vc90-mt-${BOOST_VERSION}
+          debug libboost_regex-vc90-mt-gd-${BOOST_VERSION})
+      set(BOOST_SIGNALS_LIBRARY 
+          optimized libboost_signals-vc90-mt-${BOOST_VERSION}
+          debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
     endif (MSVC71)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 3adba60..11f70b9 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -173,6 +173,7 @@ if (MSVC80)
         PATHS
          [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
         NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
         )
 
     if(EXISTS ${debug_msvc8_redist_path})
@@ -195,6 +196,7 @@ if (MSVC80)
         PATHS
          [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
         NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
         )
 
     if(EXISTS ${release_msvc8_redist_path})
diff --git a/linden/indra/cmake/FindMT.cmake b/linden/indra/cmake/FindMT.cmake
new file mode 100644
index 0000000..5239a4c
--- /dev/null
+++ b/linden/indra/cmake/FindMT.cmake
@@ -0,0 +1,15 @@
+#Find the windows manifest tool.
+
+FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt
+                 PATHS
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
+                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")
+IF(HAVE_MANIFEST_TOOL)
+    MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")
+ELSE(HAVE_MANIFEST_TOOL)
+    MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")
+ENDIF(HAVE_MANIFEST_TOOL)
+
+STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 
+      ${CMAKE_EXE_LINKER_FLAGS})
diff --git a/linden/indra/cmake/GooglePerfTools.cmake b/linden/indra/cmake/GooglePerfTools.cmake
index 25e9f6d..aff65cb 100644
--- a/linden/indra/cmake/GooglePerfTools.cmake
+++ b/linden/indra/cmake/GooglePerfTools.cmake
@@ -5,6 +5,11 @@ if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
   use_prebuilt_binary(google)
+  if (WINDOWS)
+    set(TCMALLOC_LIBRARIES 
+        debug libtcmalloc_minimal-debug
+        optimized libtcmalloc_minimal-debug)
+  endif (WINDOWS)
   if (LINUX)
     set(TCMALLOC_LIBRARIES tcmalloc)
     set(STACKTRACE_LIBRARIES stacktrace)
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
index 92aa458..4f99efd 100644
--- a/linden/indra/cmake/JPEG.cmake
+++ b/linden/indra/cmake/JPEG.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
   elseif (DARWIN)
     set(JPEG_LIBRARIES jpeg)
   elseif (WINDOWS)
-    set(JPEG_LIBRARIES jpeglib_6b)
+    set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
   set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/linden/indra/cmake/LLAddBuildTest.cmake b/linden/indra/cmake/LLAddBuildTest.cmake
new file mode 100644
index 0000000..08151bc
--- /dev/null
+++ b/linden/indra/cmake/LLAddBuildTest.cmake
@@ -0,0 +1,154 @@
+# -*- cmake -*-
+
+INCLUDE(APR)
+INCLUDE(LLMath)
+
+MACRO(ADD_BUILD_TEST_NO_COMMON name parent)
+#   MESSAGE("${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
+    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
+        SET(no_common_libraries
+            ${APRUTIL_LIBRARIES}
+            ${APR_LIBRARIES}
+            ${PTHREAD_LIBRARY}
+            ${WINDOWS_LIBRARIES}
+            )
+        SET(no_common_source_files
+            ${name}.cpp
+            tests/${name}_test.cpp
+            ${CMAKE_SOURCE_DIR}/test/test.cpp
+            )
+        ADD_BUILD_TEST_INTERNAL("${name}" "${parent}" "${no_common_libraries}" "${no_common_source_files}")
+    ENDIF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
+ENDMACRO(ADD_BUILD_TEST_NO_COMMON name parent)
+
+
+MACRO(ADD_BUILD_TEST name parent)
+    # optional extra parameter: list of additional source files
+    SET(more_source_files "${ARGN}")
+
+#   MESSAGE("${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
+    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
+
+        SET(basic_libraries
+            ${LLCOMMON_LIBRARIES}
+            ${APRUTIL_LIBRARIES}
+            ${APR_LIBRARIES}
+            ${PTHREAD_LIBRARY}
+            ${WINDOWS_LIBRARIES}
+            )
+        SET(basic_source_files
+            ${name}.cpp
+            tests/${name}_test.cpp
+            ${CMAKE_SOURCE_DIR}/test/test.cpp
+            ${CMAKE_SOURCE_DIR}/test/lltut.cpp
+            ${more_source_files}
+            )
+        ADD_BUILD_TEST_INTERNAL("${name}" "${parent}" "${basic_libraries}" "${basic_source_files}")
+
+    ENDIF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
+ENDMACRO(ADD_BUILD_TEST name parent)
+
+
+MACRO(ADD_VIEWER_BUILD_TEST name parent)
+    # This is just like the generic ADD_BUILD_TEST, but we implicitly
+    # add the necessary precompiled header .cpp file (anyone else find that
+    # oxymoronic?) because the MSVC build errors will NOT point you there.
+    ADD_BUILD_TEST("${name}" "${parent}" llviewerprecompiledheaders.cpp)
+ENDMACRO(ADD_VIEWER_BUILD_TEST name parent)
+
+
+MACRO(ADD_SIMULATOR_BUILD_TEST name parent)
+    ADD_BUILD_TEST("${name}" "${parent}" llsimprecompiledheaders.cpp)
+
+    if (WINDOWS)
+        SET_SOURCE_FILES_PROPERTIES(
+            "tests/${name}_test.cpp"
+            PROPERTIES
+            COMPILE_FLAGS "/Yullsimprecompiledheaders.h"
+        )
+    endif (WINDOWS)
+ENDMACRO(ADD_SIMULATOR_BUILD_TEST name parent)
+
+MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
+    # Optional additional parameter: pathname of Python wrapper script
+    SET(wrapper "${ARGN}")
+    #MESSAGE(STATUS "ADD_BUILD_TEST_INTERNAL ${name} wrapper = ${wrapper}")
+
+    SET(TEST_SOURCE_FILES ${source_files})
+    SET(HEADER "${name}.h")
+    set_source_files_properties(${HEADER}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+    LIST(APPEND TEST_SOURCE_FILES ${HEADER})
+    INCLUDE_DIRECTORIES("${LIBS_OPEN_DIR}/test")
+    ADD_EXECUTABLE(${name}_test ${TEST_SOURCE_FILES})
+    TARGET_LINK_LIBRARIES(${name}_test
+        ${libraries}
+        )
+
+    GET_TARGET_PROPERTY(TEST_EXE ${name}_test LOCATION)
+    SET(TEST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}_test_ok.txt)
+
+    IF ("${wrapper}" STREQUAL "")
+      SET(TEST_CMD ${TEST_EXE} --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR})
+    ELSE ("${wrapper}" STREQUAL "")
+      SET(TEST_CMD ${PYTHON_EXECUTABLE} ${wrapper} ${TEST_EXE} --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR})
+    ENDIF ("${wrapper}" STREQUAL "")
+
+    #MESSAGE(STATUS "ADD_BUILD_TEST_INTERNAL ${name} test_cmd  = ${TEST_CMD}")
+    SET(TEST_SCRIPT_CMD 
+      ${CMAKE_COMMAND} 
+      -DLD_LIBRARY_PATH=${ARCH_PREBUILT_DIRS}:/usr/lib
+      -DTEST_CMD:STRING="${TEST_CMD}" 
+      -P ${CMAKE_SOURCE_DIR}/cmake/RunBuildTest.cmake
+      )
+
+    #MESSAGE(STATUS "ADD_BUILD_TEST_INTERNAL ${name} test_script  = ${TEST_SCRIPT_CMD}")
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${TEST_OUTPUT}
+        COMMAND ${TEST_SCRIPT_CMD}
+        DEPENDS ${name}_test
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        )
+
+    ADD_CUSTOM_TARGET(${name}_test_ok ALL DEPENDS ${TEST_OUTPUT})
+    IF (${parent})
+      ADD_DEPENDENCIES(${parent} ${name}_test_ok)
+    ENDIF (${parent})
+
+ENDMACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
+
+
+MACRO(ADD_COMM_BUILD_TEST name parent wrapper)
+##  MESSAGE(STATUS "ADD_COMM_BUILD_TEST ${name} wrapper = ${wrapper}")
+    # optional extra parameter: list of additional source files
+    SET(more_source_files "${ARGN}")
+##  MESSAGE(STATUS "ADD_COMM_BUILD_TEST ${name} more_source_files = ${more_source_files}")
+
+    SET(libraries
+        ${LLMESSAGE_LIBRARIES}
+        ${LLMATH_LIBRARIES}
+        ${LLVFS_LIBRARIES}
+        ${LLCOMMON_LIBRARIES}
+        ${APRUTIL_LIBRARIES}
+        ${APR_LIBRARIES}
+        ${PTHREAD_LIBRARY}
+        ${WINDOWS_LIBRARIES}
+        )
+    SET(source_files
+        ${name}.cpp
+        tests/${name}_test.cpp
+        ${CMAKE_SOURCE_DIR}/test/test.cpp
+        ${CMAKE_SOURCE_DIR}/test/lltut.cpp
+        ${more_source_files}
+        )
+
+    ADD_BUILD_TEST_INTERNAL("${name}" "${parent}" "${libraries}" "${source_files}" "${wrapper}")
+ENDMACRO(ADD_COMM_BUILD_TEST name parent wrapper)
+
+MACRO(ADD_VIEWER_COMM_BUILD_TEST name parent wrapper)
+    # This is just like the generic ADD_COMM_BUILD_TEST, but we implicitly
+    # add the necessary precompiled header .cpp file (anyone else find that
+    # oxymoronic?) because the MSVC build errors will NOT point you there.
+##  MESSAGE(STATUS "ADD_VIEWER_COMM_BUILD_TEST ${name} wrapper = ${wrapper}")
+    ADD_COMM_BUILD_TEST("${name}" "${parent}" "${wrapper}" llviewerprecompiledheaders.cpp)
+ENDMACRO(ADD_VIEWER_COMM_BUILD_TEST name parent wrapper)
diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index dcfd269..625e212 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -8,11 +8,4 @@ set(LLAUDIO_INCLUDE_DIRS
     ${OPENAL_INCLUDE_DIRS}
     )
 
-set(LLAUDIO_LIBRARIES
-    llaudio
-    ${VORBISENC_LIBRARIES}
-    ${VORBISFILE_LIBRARIES}
-    ${VORBIS_LIBRARIES}
-    ${OGG_LIBRARIES}
-    ${OPENAL_LIBRARIES}
-    )
+set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})
diff --git a/linden/indra/cmake/LLRender.cmake b/linden/indra/cmake/LLRender.cmake
index bbcf4cd..c47e887 100644
--- a/linden/indra/cmake/LLRender.cmake
+++ b/linden/indra/cmake/LLRender.cmake
@@ -18,8 +18,8 @@ endif (SERVER AND LINUX)
 
 # mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set
 # differently for different object files.
-macro (copy_server_sources _copied_SOURCES)
-  foreach (PREFIX ${_copied_SOURCES})
+macro (copy_server_sources )
+  foreach (PREFIX ${ARGV})
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp
         COMMAND ${CMAKE_COMMAND}
diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake
index c0efa27..e749055 100644
--- a/linden/indra/cmake/LLWindow.cmake
+++ b/linden/indra/cmake/LLWindow.cmake
@@ -40,4 +40,9 @@ else (SERVER AND LINUX)
   set(LLWINDOW_LIBRARIES
       llwindow
       )
+  if (WINDOWS)
+      list(APPEND LLWINDOW_LIBRARIES
+          comdlg32
+          )
+  endif (WINDOWS)
 endif (SERVER AND LINUX)
diff --git a/linden/indra/cmake/Linking.cmake b/linden/indra/cmake/Linking.cmake
index 167c5dd..2bddb95 100644
--- a/linden/indra/cmake/Linking.cmake
+++ b/linden/indra/cmake/Linking.cmake
@@ -32,11 +32,16 @@ endif (LINUX)
 
 if (WINDOWS)
   set(WINDOWS_LIBRARIES
+      advapi32
+      shell32
       ws2_32
       mswsock
       psapi
       winmm
       netapi32
+      wldap32
+      gdi32
+      user32
       )
 else (WINDOWS)
   set(WINDOWS_LIBRARIES "")
diff --git a/linden/indra/cmake/RunBuildTest.cmake b/linden/indra/cmake/RunBuildTest.cmake
new file mode 100644
index 0000000..2da3e88
--- /dev/null
+++ b/linden/indra/cmake/RunBuildTest.cmake
@@ -0,0 +1,22 @@
+#This cmake script is meant to be run as a build time custom command.
+#The script is run using cmake w/ the -P option.
+# parameters are passed to this scripts execution with the -D option. 
+# A full command line would look like this:
+# cmake -D LD_LIBRARY_PATH=~/checkout/libraries -D TEST_CMD=./llunit_test -D ARGS=--touch=llunit_test_ok.txt -P RunBuildTest.cmake
+
+# Parameters:
+# LD_LIBRARY_PATH: string, What to set the LD_LIBRARY_PATH env var.
+# TEST_CMD: string list, command to run the unit test with, followed by its args.  
+set(ENV{LD_LIBRARY_PATH} ${LD_LIBRARY_PATH})
+#message("Running: ${TEST_CMD}")
+separate_arguments(TEST_CMD)
+#message("Running: ${TEST_CMD}")
+execute_process(
+  COMMAND ${TEST_CMD}
+  RESULT_VARIABLE RES
+  )
+
+if(NOT ${RES} STREQUAL 0)
+  message(STATUS "Failure running: ${TEST_CMD}") 
+  message(FATAL_ERROR "Error: ${RES}")
+endif(NOT ${RES} STREQUAL 0)
\ No newline at end of file
diff --git a/linden/indra/cmake/CommonMiscLibs.cmake b/linden/indra/cmake/Tut.cmake
index 513acf3..7488e9d 100644
--- a/linden/indra/cmake/CommonMiscLibs.cmake
+++ b/linden/indra/cmake/Tut.cmake
@@ -4,4 +4,3 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(tut)
 endif(NOT STANDALONE)
-
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 80d4191..48e5130 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -10,11 +10,13 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(zlib)
   if (WINDOWS)
-    set(ZLIB_LIBRARIES zlib)
+    set(ZLIB_LIBRARIES 
+      debug zlibd
+      optimized zlib)
   else (WINDOWS)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
   if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
   endif (WINDOWS OR LINUX)
 endif (STANDALONE)