Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.

38 files changed, 1175 insertions, 342 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index d1f379c..7e85ce0 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 -D_SECURE_SCL=0 -DNDEBUG")
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-    "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+    "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
 
 # Don't bother with a MinSizeRel build.
@@ -20,6 +20,14 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
     "Supported build types." FORCE)
 
 
+# Determine the number of bits of this processor
+
+if(CMAKE_SIZEOF_VOID_P MATCHES 4)
+   set( HAVE_64_BIT 0 )
+else(CMAKE_SIZEOF_VOID_P MATCHES 4)
+   set( HAVE_64_BIT 1 )
+endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
+
 # Platform-specific compilation flags.
 
 if (WINDOWS)
@@ -55,6 +63,7 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
+      /MP
       )
      
   if(MSVC80 OR MSVC90)
@@ -169,23 +178,10 @@ if (LINUX)
       add_definitions(-fno-stack-protector)
     endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
-       add_definitions( -DLINUX64=1
-                        #this rather needs to be done elsewhere
-                        #anyway these are the flags for the 64bit releases:
-                        -DLL_VECTORIZE=1
-                        -O2
-                        -fomit-frame-pointer
-                        -pipe 
-                        -mmmx
-                        -msse
-                        -mfpmath=sse
-                        -msse2
-                        -ffast-math
-                        -ftree-vectorize
-                        -fweb -fexpensive-optimizations
-                        -frename-registers
-                        )
-
+       # This rather needs to be done elsewhere
+       # anyway these are the flags for the 64bit releases:
+       add_definitions(-DLINUX64=1 -pipe)
+       set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
     endif (${ARCH} STREQUAL "x86_64")
   endif (VIEWER)
 
@@ -198,8 +194,8 @@ if (DARWIN)
   add_definitions(-DLL_DARWIN=1)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch -msse3 -mssse3 -w")
   # NOTE: it's critical that the optimization flag is put in front.
   # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
@@ -214,7 +210,7 @@ if (LINUX OR DARWIN)
     set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
   endif (NOT GCC_DISABLE_FATAL_WARNINGS)
 
-  set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor")
+  set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual")
 
   set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index e9f6411..d1f0898 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -14,27 +14,27 @@ else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/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}/apriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-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}
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
       )
   elseif (DARWIN)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
diff --git a/linden/indra/cmake/BerkeleyDB.cmake b/linden/indra/cmake/BerkeleyDB.cmake
index d98e791..de62763 100644
--- a/linden/indra/cmake/BerkeleyDB.cmake
+++ b/linden/indra/cmake/BerkeleyDB.cmake
@@ -6,6 +6,11 @@ set(DB_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindBerkeleyDB)
 else (STANDALONE)
-  set(DB_LIBRARIES db-4.2)
+  if (LINUX)
+        # Need to add dependency pthread explicitely to support ld.gold.
+    set(DB_LIBRARIES db-4.2 pthread)
+  else (LINUX)
+    set(DB_LIBRARIES db-4.2)
+  endif (LINUX)
   set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index a84a09f..75ac62e 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -6,7 +6,6 @@ set(Boost_FIND_REQUIRED ON)
 
 if (STANDALONE)
   include(FindBoost)
-
   set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
   set(BOOST_REGEX_LIBRARY boost_regex-mt)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
@@ -15,7 +14,7 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_36)
+    set(BOOST_VERSION 1_43)
     if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
diff --git a/linden/indra/cmake/CMakeLists.txt b/linden/indra/cmake/CMakeLists.txt
index e69de29..4a7d633 100644
--- a/linden/indra/cmake/CMakeLists.txt
+++ b/linden/indra/cmake/CMakeLists.txt
@@ -0,0 +1,119 @@
+# -*- cmake -*-
+
+include(00-Common)
+
+project(cmake)
+
+set(cmake_SOURCE_FILES
+    CMakeLists.txt
+
+    00-Common.cmake
+        APR.cmake
+        Audio.cmake
+        BerkeleyDB.cmake
+        Boost.cmake
+        BuildVersion.cmake
+        CARes.cmake
+        CMakeCopyIfDifferent.cmake
+        CopyBackToSource.cmake
+        CopyWinLibs.cmake
+        CSharpMacros.cmake
+        CURL.cmake
+        DBusGlib.cmake
+        DirectX.cmake
+        ELFIO.cmake
+        ExamplePlugin.cmake
+        EXPAT.cmake
+        FindAPR.cmake
+        FindBerkeleyDB.cmake
+        FindCARes.cmake
+        FindELFIO.cmake
+        FindGooglePerfTools.cmake
+        FindHunSpell.cmake
+        FindJsonCpp.cmake
+        FindLLQtWebkit.cmake
+        FindMono.cmake
+        FindMT.cmake
+        FindMySQL.cmake
+        FindNDOF.cmake
+        FindOpenJPEG.cmake
+        FindSCP.cmake
+        FindTut.cmake
+        FindXmlRpcEpi.cmake
+        FindZLIB.cmake
+        FMOD.cmake
+        FreeType.cmake
+        Glui.cmake
+        Glut.cmake
+        GooglePerfTools.cmake
+        GStreamer010Plugin.cmake
+        HUNSPELL.cmake
+        JPEG.cmake
+        JsonCpp.cmake
+        Linking.cmake
+        LLAddBuildTest.cmake
+        LLAudio.cmake
+        LLCharacter.cmake
+        LLCommon.cmake
+        LLCrashLogger.cmake
+        LLDatabase.cmake
+        LLImage.cmake
+        LLImageJ2COJ.cmake
+        LLInventory.cmake
+        LLMath.cmake
+        LLMessage.cmake
+        LLPlugin.cmake
+        LLPrimitive.cmake
+        LLRender.cmake
+        LLScene.cmake
+        LLUI.cmake
+        LLVFS.cmake
+        LLWindow.cmake
+        LLXML.cmake
+        LScript.cmake
+        MediaPluginBase.cmake
+        MonoDeps.cmake
+        MonoEmbed.cmake
+        Mozlib.cmake
+        MySQL.cmake
+        NDOF.cmake
+        OPENAL.cmake
+        OpenGL.cmake
+        OpenJPEG.cmake
+        OpenSSL.cmake
+        PluginAPI.cmake
+        PNG.cmake
+        Prebuilt.cmake
+        PulseAudio.cmake
+        Python.cmake
+        QuickTimePlugin.cmake
+        RunBuildTest.cmake
+        TemplateCheck.cmake
+        Tut.cmake
+        UI.cmake
+        UnixInstall.cmake
+        Variables.cmake
+        ViewerArtwork.cmake
+        ViewerMiscLibs.cmake
+        WebKitLibPlugin.cmake
+        XmlRpcEpi.cmake
+        ZLIB.cmake
+    )
+
+source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
+
+set(master_SOURCE_FILES
+    ../CMakeLists.txt
+    ../develop.py
+    )
+
+source_group("Master Rules" FILES ${master_SOURCE_FILES})
+
+set_source_files_properties(${cmake_SOURCE_FILES} ${master_SOURCE_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+add_library(cmake
+            cmake_dummy.cpp
+            ${cmake_SOURCE_FILES}
+            ${master_SOURCE_FILES}
+            )
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 13530d8..78c7c96 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -6,6 +6,7 @@
 
 include(CMakeCopyIfDifferent)
 
+# Copying vivox's alut.dll breaks inworld audio, never use it
 set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
     SLVoice.exe
@@ -14,75 +15,84 @@ set(vivox_files
     ortp.dll
     wrap_oal.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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(debug_files
     alut.dll
-    freebl3.dll
-    js3250.dll
-    nspr4.dll
-    nss3.dll
-    nssckbi.dll
     openal32.dll
     openjpegd.dll
-    plc4.dll
-    plds4.dll
-    smime3.dll
-    softokn3.dll
-    ssl3.dll
-    xpcom.dll
-    xul.dll
-    windbgdlg.exe
-    iconv.dll
-    libxml2.dll
-        libcairo-2.dll
+    libhunspell.dll
+    libapr-1.dll
+    libaprutil-1.dll
+    libapriconv-1.dll
+        
+        # gstreamer streaming files below
+        avcodec-gpl-52.dll
+        avdevice-gpl-52.dll
+        avfilter-gpl-1.dll
+        avformat-gpl-52.dll
+        avutil-gpl-50.dll
+        iconv.dll
+        liba52-0.dll
+        libbz2.dll
+        libcelt-0.dll
+        libdca-0.dll
+        libexpat-1.dll
         libfaad-2.dll
-    libgio-2.0-0.dll
-    libglib-2.0-0.dll
-    libgmodule-2.0-0.dll
-    libgobject-2.0-0.dll
-    libgthread-2.0-0.dll
-    charset.dll
-        intl.dll
+        libFLAC-8.dll
         libgcrypt-11.dll
+        libgio-2.0-0.dll
+        libglib-2.0-0.dll
+        libgmodule-2.0-0.dll
         libgnutls-26.dll
+        libgobject-2.0-0.dll
         libgpg-error-0.dll
-        libgstapp.dll
-        libgstaudio.dll
+        libgstapp-0.10.dll
         libgstaudio-0.10.dll
         libgstbase-0.10.dll
-        libgstcdda.dll
         libgstcontroller-0.10.dll
         libgstdataprotocol-0.10.dll
-        libgstdshow.dll
-        libgstfft.dll
-        libgstinterfaces.dll
+        libgstfft-0.10.dll
+        libgstinterfaces-0.10.dll
         libgstnet-0.10.dll
-        libgstnetbuffer.dll
-        libgstpbutils.dll
+        libgstnetbuffer-0.10.dll
+        libgstpbutils-0.10.dll
+        libgstphotography-0.10.dll
         libgstreamer-0.10.dll
-        libgstriff.dll
-        libgstrtp.dll
-        libgstrtsp.dll
-        libgstsdp.dll
-        libgsttag.dll
-        libgstvideo.dll
-        libjpeg.dll
-        libmp3lame-0.dll
+        libgstriff-0.10.dll
+        libgstrtp-0.10.dll
+        libgstrtsp-0.10.dll
+        libgstsdp-0.10.dll
+        libgstsignalprocessor-0.10.dll
+        libgsttag-0.10.dll
+        libgstvideo-0.10.dll
+        libgthread-2.0-0.dll
+        libmms-0.dll
+        libmpeg2-0.dll
         libneon-27.dll
         libogg-0.dll
         liboil-0.3-0.dll
-        libopenjpeg-2.dll
-        libpng12-0.dll
-        libschroedinger-1.0-0.dll
-        libspeex-1.dll
+        libsoup-2.4-1.dll
+        libtasn1-3.dll
         libtheora-0.dll
+        libtheoradec-1.dll
         libvorbis-0.dll
         libvorbisenc-2.dll
+        libvorbisfile-3.dll
+        libwavpack-1.dll
+        libx264-67.dll
         libxml2-2.dll
-        glew32.dll
-    xvidcore.dll
-    zlib1.dll
+        libxml2.dll
+        SDL.dll
+        xvidcore.dll
+        z.dll
     )
 
 copy_if_different(
@@ -93,81 +103,240 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
+# Debug config runtime files required for the plugin test mule
+set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+set(plugintest_debug_files
+    libeay32.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+        qtxmlpatternsd4.dll
+    ssleay32.dll
+    )
 copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-    out_targets 
-    ${vivox_files}
+    ${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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+set(plugintest_release_files
+    libeay32.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+        qtxmlpatterns4.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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+set(plugins_debug_files
+    libeay32.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+        qtxmlpatternsd4.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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+set(plugins_release_files
+    libeay32.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+        qtxmlpatterns4.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 "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
     alut.dll
-    freebl3.dll
-    js3250.dll
-    nspr4.dll
-    nss3.dll
-    nssckbi.dll
     openal32.dll
     openjpeg.dll
-    plc4.dll
-    plds4.dll
-    smime3.dll
-    softokn3.dll
-    ssl3.dll
-    xpcom.dll
-    xul.dll
-    iconv.dll
-    libxml2.dll
-        libcairo-2.dll
+    libhunspell.dll
+    libapr-1.dll
+    libaprutil-1.dll
+    libapriconv-1.dll
+        
+        # gstreamer streaming files below
+        avcodec-gpl-52.dll
+        avdevice-gpl-52.dll
+        avfilter-gpl-1.dll
+        avformat-gpl-52.dll
+        avutil-gpl-50.dll
+        iconv.dll
+        liba52-0.dll
+        libbz2.dll
+        libcelt-0.dll
+        libdca-0.dll
+        libexpat-1.dll
         libfaad-2.dll
-    libgio-2.0-0.dll
-    libglib-2.0-0.dll
-    libgmodule-2.0-0.dll
-    libgobject-2.0-0.dll
-    libgthread-2.0-0.dll
-        charset.dll
-        intl.dll
+        libFLAC-8.dll
         libgcrypt-11.dll
+        libgio-2.0-0.dll
+        libglib-2.0-0.dll
+        libgmodule-2.0-0.dll
         libgnutls-26.dll
+        libgobject-2.0-0.dll
         libgpg-error-0.dll
-        libgstapp.dll
-        libgstaudio.dll
+        libgstapp-0.10.dll
         libgstaudio-0.10.dll
         libgstbase-0.10.dll
-        libgstcdda.dll
         libgstcontroller-0.10.dll
         libgstdataprotocol-0.10.dll
-        libgstdshow.dll
-        libgstfft.dll
-        libgstinterfaces.dll
+        libgstfft-0.10.dll
+        libgstinterfaces-0.10.dll
         libgstnet-0.10.dll
-        libgstnetbuffer.dll
-        libgstpbutils.dll
+        libgstnetbuffer-0.10.dll
+        libgstpbutils-0.10.dll
+        libgstphotography-0.10.dll
         libgstreamer-0.10.dll
-        libgstriff.dll
-        libgstrtp.dll
-        libgstrtsp.dll
-        libgstsdp.dll
-        libgsttag.dll
-        libgstvideo.dll
-        libjpeg.dll
-        libmp3lame-0.dll
+        libgstriff-0.10.dll
+        libgstrtp-0.10.dll
+        libgstrtsp-0.10.dll
+        libgstsdp-0.10.dll
+        libgstsignalprocessor-0.10.dll
+        libgsttag-0.10.dll
+        libgstvideo-0.10.dll
+        libgthread-2.0-0.dll
+        libmms-0.dll
+        libmpeg2-0.dll
         libneon-27.dll
         libogg-0.dll
         liboil-0.3-0.dll
-        libopenjpeg-2.dll
-        libpng12-0.dll
-        libschroedinger-1.0-0.dll
-        libspeex-1.dll
+        libsoup-2.4-1.dll
+        libtasn1-3.dll
         libtheora-0.dll
+        libtheoradec-1.dll
         libvorbis-0.dll
         libvorbisenc-2.dll
+        libvorbisfile-3.dll
+        libwavpack-1.dll
+        libx264-67.dll
         libxml2-2.dll
-        glew32.dll
-    xvidcore.dll
-    zlib1.dll
+        libxml2.dll
+        SDL.dll
+        xvidcore.dll
+        z.dll
     )
     
 copy_if_different(
diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake
index dfda0ad..b78a0b1 100644
--- a/linden/indra/cmake/DBusGlib.cmake
+++ b/linden/indra/cmake/DBusGlib.cmake
@@ -7,6 +7,7 @@ if (STANDALONE)
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
 
 elseif (LINUX)
+  use_prebuilt_binary(glib)             # dbusglib needs glib
   use_prebuilt_binary(dbusglib)
   set(DBUSGLIB_FOUND ON FORCE BOOL)
   set(DBUSGLIB_INCLUDE_DIRS
diff --git a/linden/indra/cmake/ExamplePlugin.cmake b/linden/indra/cmake/ExamplePlugin.cmake
new file mode 100644
index 0000000..599787a
--- /dev/null
+++ b/linden/indra/cmake/ExamplePlugin.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (STANDALONE)
+    set(EXAMPLEPLUGIN OFF CACHE BOOL
+        "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
+else (STANDALONE)
+    set(EXAMPLEPLUGIN ON CACHE BOOL
+        "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
+endif (STANDALONE)
+
+if (WINDOWS)
+elseif (DARWIN)
+elseif (LINUX)
+endif (WINDOWS)
diff --git a/linden/indra/cmake/FindHunSpell.cmake b/linden/indra/cmake/FindHunSpell.cmake
new file mode 100644
index 0000000..d41f9cf
--- /dev/null
+++ b/linden/indra/cmake/FindHunSpell.cmake
@@ -0,0 +1,34 @@
+FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell.hxx
+  /usr/local/include/hunspell
+  /usr/local/include
+  /usr/include/hunspell
+  /usr/include
+  )
+
+SET(HUNSPELL_NAMES ${HUNSPELL_NAMES} hunspell hunspell-1.2)
+FIND_LIBRARY(HUNSPELL_LIBRARY
+  NAMES ${HUNSPELL_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+  SET(HUNSPELL_LIBRARIES ${HUNSPELL_LIBRARY})
+  SET(HUNSPELL_FOUND "YES")
+ELSE(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+  SET(HUNSPELL_FOUND "NO")
+ENDIF(HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
+
+IF(HUNSPELL_FOUND)
+  IF(NOT HUNSPELL_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Hunspell: ${HUNSPELL_LIBRARIES}")
+  ENDIF(NOT HUNSPELL_FIND_QUIETLY)
+ELSE(HUNSPELL_FOUND)
+  IF(HUNSPELL_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find HunSpell library")
+  ENDIF(HUNSPELL_FIND_REQUIRED)
+ENDIF(HUNSPELL_FOUND)
+
+MARK_AS_ADVANCED(
+  HUNSPELL_LIBRARY
+  HUNSPELL_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindJsonCpp.cmake b/linden/indra/cmake/FindJsonCpp.cmake
new file mode 100644
index 0000000..cf84b30
--- /dev/null
+++ b/linden/indra/cmake/FindJsonCpp.cmake
@@ -0,0 +1,60 @@
+# -*- cmake -*-
+
+# - Find JSONCpp
+# Find the JSONCpp includes and library
+# This module defines
+#  JSONCPP_INCLUDE_DIR, where to find json.h, etc.
+#  JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
+#  JSONCPP_FOUND, If false, do not try to use jsoncpp.
+#  also defined, but not for general use are
+#  JSONCPP_LIBRARY, where to find the jsoncpp library.
+
+FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h
+/usr/local/include
+/usr/include
+)
+
+# Get the GCC compiler version
+EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+            ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+            OUTPUT_VARIABLE _gcc_COMPILER_VERSION
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+
+# Try to find a library that was compiled with the same compiler version as we currently use.
+SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
+IF (STANDALONE)
+        # On standalone, assume that the system installed library was compiled with the used compiler.
+        SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
+ENDIF (STANDALONE)
+FIND_LIBRARY(JSONCPP_LIBRARY
+  NAMES ${JSONCPP_NAMES}
+  PATHS /usr/lib /usr/local/lib
+  )
+
+IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+    SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+    SET(JSONCPP_FOUND "YES")
+ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+  SET(JSONCPP_FOUND "NO")
+ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
+
+
+IF (JSONCPP_FOUND)
+   IF (NOT JSONCPP_FIND_QUIETLY)
+      MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
+   ENDIF (NOT JSONCPP_FIND_QUIETLY)
+ELSE (JSONCPP_FOUND)
+   IF (JSONCPP_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find JSONCpp library")
+   ENDIF (JSONCPP_FIND_REQUIRED)
+ENDIF (JSONCPP_FOUND)
+
+# Deprecated declarations.
+SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} )
+GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH)
+
+MARK_AS_ADVANCED(
+  JSONCPP_LIBRARY
+  JSONCPP_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindLLQtWebkit.cmake b/linden/indra/cmake/FindLLQtWebkit.cmake
new file mode 100644
index 0000000..c747ec3
--- /dev/null
+++ b/linden/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
+  )
+
diff --git a/linden/indra/cmake/FindNDOF.cmake b/linden/indra/cmake/FindNDOF.cmake
new file mode 100644
index 0000000..f980e34
--- /dev/null
+++ b/linden/indra/cmake/FindNDOF.cmake
@@ -0,0 +1,39 @@
+# -*- cmake -*-
+
+# - Find NDOF
+# Find the NDOF includes and library
+# This module defines
+#  NDOF_INCLUDE_DIR, where to find ndofdev_external.h, etc.
+#  NDOF_LIBRARY, the library needed to use NDOF.
+#  NDOF_FOUND, If false, do not try to use NDOF.
+
+find_path(NDOF_INCLUDE_DIR ndofdev_external.h
+  PATH_SUFFIXES ndofdev
+  )
+
+set(NDOF_NAMES ${NDOF_NAMES} ndofdev libndofdev)
+find_library(NDOF_LIBRARY
+  NAMES ${NDOF_NAMES}
+  )
+
+if (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
+  set(NDOF_FOUND "YES")
+else (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
+  set(NDOF_FOUND "NO")
+endif (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
+
+
+if (NDOF_FOUND)
+  if (NOT NDOF_FIND_QUIETLY)
+    message(STATUS "Found NDOF: Library in '${NDOF_LIBRARY}' and header in '${NDOF_INCLUDE_DIR}' ")
+  endif (NOT NDOF_FIND_QUIETLY)
+else (NDOF_FOUND)
+  if (NDOF_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find NDOF library!")
+  endif (NDOF_FIND_REQUIRED)
+endif (NDOF_FOUND)
+
+mark_as_advanced(
+  NDOF_LIBRARY
+  NDOF_INCLUDE_DIR
+  )
diff --git a/linden/indra/cmake/FindTut.cmake b/linden/indra/cmake/FindTut.cmake
new file mode 100644
index 0000000..5ac7ec0
--- /dev/null
+++ b/linden/indra/cmake/FindTut.cmake
@@ -0,0 +1,33 @@
+# -*- cmake -*-
+
+# - Find Tut
+# Find the Tut unit test framework includes and library
+# This module defines
+#  TUT_INCLUDE_DIR, where to find tut/tut.hpp, etc.
+#  TUT_FOUND, If false, do not try to use Tut.
+
+find_path(TUT_INCLUDE_DIR tut/tut.hpp
+  NO_SYSTEM_ENVIRONMENT_PATH
+)
+
+IF (TUT_INCLUDE_DIR)
+    SET(TUT_FOUND "YES")
+ELSE (TUT_INCLUDE_DIR)
+  SET(TUT_FOUND "NO")
+ENDIF (TUT_INCLUDE_DIR)
+
+IF (TUT_FOUND)
+   IF (NOT TUT_FIND_QUIETLY)
+      MESSAGE(STATUS "Found Tut: ${TUT_INCLUDE_DIR}")
+        SET(TUT_FIND_QUIETLY TRUE) # Only alert us the first time
+   ENDIF (NOT TUT_FIND_QUIETLY)
+ELSE (TUT_FOUND)
+   IF (TUT_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Tut")
+   ENDIF (TUT_FIND_REQUIRED)
+ENDIF (TUT_FOUND)
+
+MARK_AS_ADVANCED(
+    TUT_INCLUDE_DIR
+)
+
diff --git a/linden/indra/cmake/FindZLIB.cmake b/linden/indra/cmake/FindZLIB.cmake
new file mode 100644
index 0000000..6d630f1
--- /dev/null
+++ b/linden/indra/cmake/FindZLIB.cmake
@@ -0,0 +1,46 @@
+# -*- cmake -*-
+
+# - Find zlib
+# Find the ZLIB includes and library
+# This module defines
+#  ZLIB_INCLUDE_DIRS, where to find zlib.h, etc.
+#  ZLIB_LIBRARIES, the libraries needed to use zlib.
+#  ZLIB_FOUND, If false, do not try to use zlib.
+#
+# This FindZLIB is about 43 times as fast the one provided with cmake (2.8.x),
+# because it doesn't look up the version of zlib, resulting in a dramatic
+# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
+#
+# Note: Since this file is only used for standalone, the windows
+# specific parts were left out.
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+  NO_SYSTEM_ENVIRONMENT_PATH
+  )
+
+FIND_LIBRARY(ZLIB_LIBRARY z)
+
+if (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+  SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
+  SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+  SET(ZLIB_FOUND "YES")
+else (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+  SET(ZLIB_FOUND "NO")
+endif (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+
+if (ZLIB_FOUND)
+  if (NOT ZLIB_FIND_QUIETLY)
+        message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES}")
+        SET(ZLIB_FIND_QUIETLY TRUE)
+  endif (NOT ZLIB_FIND_QUIETLY)
+else (ZLIB_FOUND)
+  if (ZLIB_FIND_REQUIRED)
+        message(FATAL_ERROR "Could not find ZLIB library")
+  endif (ZLIB_FIND_REQUIRED)
+endif (ZLIB_FOUND)
+
+mark_as_advanced(
+  ZLIB_LIBRARY
+  ZLIB_INCLUDE_DIR
+  )
+
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
deleted file mode 100644
index d318f28..0000000
--- a/linden/indra/cmake/GStreamer.cmake
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-  # Maybe libxml and glib should have their own .cmake files
-  use_prebuilt_binary(libxml)
-  use_prebuilt_binary(glib)
-
-  set(GSTREAMER_FOUND ON FORCE BOOL)
-  set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
-
-  use_prebuilt_binary(gstreamer)
-  use_prebuilt_binary(gstreamer-plugins)
-
-if (WINDOWS)
-
-  use_prebuilt_binary(iconv)
-  set(GSTREAMER_FOUND ON FORCE BOOL)
-  set(GSTREAMER_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gio
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gobject
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/iconv
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gst
-      )
-
-  set(GSTREAMER_LIBRARIES
-      glib-2.0
-      gio-2.0
-      gmodule-2.0
-      gobject-2.0
-      gthread-2.0
-      libgstvideo.lib
-      libgsttag.lib
-      libgstsdp.lib
-      libgstrtsp.lib
-      libgstrtp.lib
-      libgstriff.lib
-      libgstreamer-0.10.lib
-      libgstpbutils.lib
-      libgstnetbuffer.lib
-      libgstnet-0.10.lib
-      libgstinterfaces.lib
-      libgstdshow.lib
-      libgstdataprotocol-0.10.lib
-      libgstcontroller-0.10.lib
-      libgstbase-0.10.lib
-      libgstaudio.lib
-      libgstapp.lib
-      libxml2
-      libxml2_a
-      libxml2_a_dll
-      iconv
-      iconv_a
-      )
-
-else (WINDOWS)
-
-  set(GSTREAMER_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/glib-2.0/glib
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/gobject
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
-      )
-
-  if (DARWIN) # Mac
-
-    use_prebuilt_binary(flac)
-    use_prebuilt_binary(liboil)
-    use_prebuilt_binary(neon)
-    use_prebuilt_binary(theora)
-
-    set(GSTREAMER_LIBRARIES
-        gstvideo-0.10
-        gstaudio-0.10
-        gstbase-0.10
-        gstreamer-0.10
-        gobject-2.0
-        gmodule-2.0
-        gthread-2.0
-        glib-2.0
-        xml2.2
-        )
-
-  else (DARWIN) # Linux
-
-    use_prebuilt_binary(liboil)
-    use_prebuilt_binary(theora)
-
-    set(GSTREAMER_LIBRARIES
-        gstvideo-0.10
-        gstaudio-0.10
-        gstbase-0.10
-        gstreamer-0.10
-        gobject-2.0
-        gmodule-2.0
-        dl
-        gthread-2.0
-        rt
-        glib-2.0
-        gio-2.0
-        )
-
-  endif (DARWIN)
-
-endif (WINDOWS)
-
-if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
-  set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.")
-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
-
-if (GSTREAMER)
-  add_definitions(-DLL_GSTREAMER_ENABLED=1)
-endif (GSTREAMER)
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
new file mode 100644
index 0000000..9d2c553
--- /dev/null
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -0,0 +1,76 @@
+# -*- 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(gstreamer)        # includes glib, libxml, and iconv on Windows
+  use_prebuilt_binary(gstreamer-plugins)
+  set(GSTREAMER010_FOUND ON FORCE BOOL)
+  set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
+  if (WINDOWS)
+    set(GSTREAMER010_INCLUDE_DIRS
+                ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10
+                ${LIBS_PREBUILT_DIR}/include/glib
+                ${LIBS_PREBUILT_DIR}/include/libxml2
+                )
+  else (WINDOWS)
+    use_prebuilt_binary(glib)                   # gstreamer needs glib
+        use_prebuilt_binary(libxml)
+        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 (WINDOWS)
+
+endif (STANDALONE)
+
+if (WINDOWS)
+  # We don't need to explicitly link against gstreamer itself, because
+  # LLMediaImplGStreamer probes for the system's copy at runtime.
+    set(GSTREAMER010_LIBRARIES
+         gstaudio-0.10.lib
+         gstbase-0.10.lib
+         gstreamer-0.10.lib
+         gstvideo-0.10.lib #slvideoplugin
+                 gstinterfaces-0.10.lib
+         gobject-2.0
+         gmodule-2.0
+         gthread-2.0
+         glib-2.0
+         )
+else (WINDOWS)
+  # We don't need to explicitly link against gstreamer itself, because
+  # LLMediaImplGStreamer probes for the system's copy at runtime.
+    set(GSTREAMER010_LIBRARIES
+         gstvideo-0.10
+         gstaudio-0.10
+         gstbase-0.10
+         gstreamer-0.10
+         gobject-2.0
+         gmodule-2.0
+         dl
+         gthread-2.0
+         rt
+         glib-2.0
+         )
+
+
+endif (WINDOWS)
+
+
+if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
+  set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
+  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
+endif (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
+
+  
+
+
diff --git a/linden/indra/cmake/Glui.cmake b/linden/indra/cmake/Glui.cmake
new file mode 100644
index 0000000..f62a568
--- /dev/null
+++ b/linden/indra/cmake/Glui.cmake
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (STANDALONE)
+    set(GLUI OFF CACHE BOOL
+        "GLUI support for the llplugin/llmedia test apps.")
+else (STANDALONE)
+    use_prebuilt_binary(glui)
+    set(GLUI ON CACHE BOOL
+        "GLUI support for the llplugin/llmedia test apps.")
+endif (STANDALONE)
+
+if (LINUX)
+    set(GLUI ON CACHE BOOL
+        "llplugin media apps HACK for Linux.")
+endif (LINUX)
+
+if (DARWIN OR LINUX)
+    set(GLUI_LIBRARY
+        glui)
+endif (DARWIN OR LINUX)
+
+if (WINDOWS)
+    set(GLUI_LIBRARY
+        debug glui32.lib
+        optimized glui32.lib)
+endif (WINDOWS)
diff --git a/linden/indra/cmake/Glut.cmake b/linden/indra/cmake/Glut.cmake
new file mode 100644
index 0000000..314da30
--- /dev/null
+++ b/linden/indra/cmake/Glut.cmake
@@ -0,0 +1,19 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (WINDOWS)
+    use_prebuilt_binary(freeglut)
+    set(GLUT_LIBRARY
+        debug freeglut_static.lib
+        optimized freeglut_static.lib)
+endif (WINDOWS)
+
+if (LINUX)
+  FIND_LIBRARY(GLUT_LIBRARY glut)
+endif (LINUX)
+
+if (DARWIN)
+  include(CMakeFindFrameworks)
+  find_library(GLUT_LIBRARY GLUT)
+endif (DARWIN)
diff --git a/linden/indra/cmake/HUNSPELL.cmake b/linden/indra/cmake/HUNSPELL.cmake
new file mode 100644
index 0000000..cd5d7e0
--- /dev/null
+++ b/linden/indra/cmake/HUNSPELL.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+        include(FindHunSpell)
+else (STANDALONE)
+    use_prebuilt_binary(hunspell)
+        
+        set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+
+        if (LINUX OR DARWIN)
+            set(HUNSPELL_LIBRARY hunspell-1.2)
+        else (LINUX OR DARWIN)
+            set(HUNSPELL_LIBRARY libhunspell)
+        endif (LINUX OR DARWIN)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/JsonCpp.cmake b/linden/indra/cmake/JsonCpp.cmake
new file mode 100644
index 0000000..fe6369d
--- /dev/null
+++ b/linden/indra/cmake/JsonCpp.cmake
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+set(JSONCPP_FIND_QUIETLY ON)
+set(JSONCPP_FIND_REQUIRED ON)
+
+if (STANDALONE)
+  include(FindJsonCpp)
+else (STANDALONE)
+  use_prebuilt_binary(jsoncpp)
+  if (WINDOWS)
+    if (MSVC80)
+      set(JSONCPP_LIBRARIES 
+        debug json_vc80d
+        optimized json_vc80)
+    elseif (MSVC90)
+      set(JSONCPP_LIBRARIES 
+        debug json_vc90d
+        optimized json_vc90)
+        endif(MSVC80)
+  elseif (DARWIN)
+    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+  elseif (LINUX)
+    set(JSONCPP_LIBRARIES jsoncpp)
+  endif (WINDOWS)
+  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
+endif (STANDALONE)
diff --git a/linden/indra/cmake/LLAudio.cmake b/linden/indra/cmake/LLAudio.cmake
index 625e212..89b790c 100644
--- a/linden/indra/cmake/LLAudio.cmake
+++ b/linden/indra/cmake/LLAudio.cmake
@@ -1,11 +1,9 @@
 # -*- cmake -*-
 
 include(Audio)
-include(OPENAL)
 
 set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
-    ${OPENAL_INCLUDE_DIRS}
     )
 
 set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})
diff --git a/linden/indra/cmake/LLCommon.cmake b/linden/indra/cmake/LLCommon.cmake
index 410766e..d87d3c0 100644
--- a/linden/indra/cmake/LLCommon.cmake
+++ b/linden/indra/cmake/LLCommon.cmake
@@ -7,9 +7,15 @@ include(ZLIB)
 
 set(LLCOMMON_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcommon
-    ${APRUTIL_INCLUDE_DIR}
     ${APR_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
     )
 
-set(LLCOMMON_LIBRARIES llcommon)
+if (LINUX)
+    # In order to support using ld.gold on linux, we need to explicitely
+    # specify all libraries that llcommon uses.
+    # llcommon uses `clock_gettime' which is provided by librt on linux.
+    set(LLCOMMON_LIBRARIES llcommon rt)
+else (LINUX)
+    set(LLCOMMON_LIBRARIES llcommon)
+endif (LINUX)
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
deleted file mode 100644
index 8a36a69..0000000
--- a/linden/indra/cmake/LLMedia.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- cmake -*-
-
-include(GStreamer)
-
-set(LLMEDIA_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llmedia
-    )
-
-set(LLMEDIA_LIBRARIES
-    llmedia
-    ${GSTREAMER_LIBRARIES}
-    ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
-    )
diff --git a/linden/indra/cmake/LLPlugin.cmake b/linden/indra/cmake/LLPlugin.cmake
new file mode 100644
index 0000000..9722f16
--- /dev/null
+++ b/linden/indra/cmake/LLPlugin.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+
+set(LLPLUGIN_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llplugin
+    )
+
+set(LLPLUGIN_LIBRARIES llplugin)
diff --git a/linden/indra/cmake/MediaPluginBase.cmake b/linden/indra/cmake/MediaPluginBase.cmake
new file mode 100644
index 0000000..2be035b
--- /dev/null
+++ b/linden/indra/cmake/MediaPluginBase.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+
+set(MEDIA_PLUGIN_BASE_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/media_plugins/base/
+    )
+
+set(MEDIA_PLUGIN_BASE_LIBRARIES media_plugin_base)
diff --git a/linden/indra/cmake/Mozlib.cmake b/linden/indra/cmake/Mozlib.cmake
index e9555df..e69de29 100644
--- a/linden/indra/cmake/Mozlib.cmake
+++ b/linden/indra/cmake/Mozlib.cmake
@@ -1,47 +0,0 @@
-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-
-if (STANDALONE)
-    set(MOZLIB OFF CACHE BOOL 
-        "Enable Mozilla support in the viewer (requires llmozlib library).")
-else (STANDALONE)
-    use_prebuilt_binary(llmozlib)
-    set(MOZLIB ON CACHE BOOL
-        "Enable Mozilla support in the viewer (requires llmozlib library).")
-endif (STANDALONE)
-
-if (MOZLIB)
-    add_definitions(-DLL_LLMOZLIB_ENABLED=1)
-
-    if (LINUX)
-        link_directories(${CMAKE_SOURCE_DIR}/newview/app_settings/mozilla-runtime-linux-${ARCH})
-        set(MOZLIB_LIBRARIES
-            llmozlib2
-            mozjs
-            nspr4
-            plc4
-            plds4
-            xpcom
-            xul
-            profdirserviceprovider_s
-            )
-    elseif (WINDOWS)
-        if (MSVC71)
-            set(MOZLIB_LIBRARIES 
-                debug llmozlib2d
-                optimized llmozlib2)
-        elseif (MSVC80 OR MSVC90)
-            set(MOZLIB_LIBRARIES 
-                debug llmozlib2d-vc80
-                optimized llmozlib2-vc80)
-        endif (MSVC71)
-    else (LINUX)
-        set(MOZLIB_LIBRARIES
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllmozlib2.dylib
-          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllmozlib2.dylib
-          )
-    endif (LINUX)
-else (MOZLIB)
-    add_definitions(-DLL_LLMOZLIB_ENABLED=0)
-endif (MOZLIB)
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake
index dad74e9..bdf5db1 100644
--- a/linden/indra/cmake/NDOF.cmake
+++ b/linden/indra/cmake/NDOF.cmake
@@ -1,14 +1,28 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-use_prebuilt_binary(ndofdev)
+if (STANDALONE)
+  include(FindNDOF)
+  if(NOT NDOF_FOUND)
+    message(STATUS "Building without N-DoF joystick support")
+  endif(NOT NDOF_FOUND)
+else (STANDALONE)
+  use_prebuilt_binary(ndofdev)
 
-if (WINDOWS OR DARWIN OR LINUX)
-  add_definitions(-DLIB_NDOF=1)
-endif (WINDOWS OR DARWIN OR LINUX)
+  if (WINDOWS)
+    set(NDOF_LIBRARY libndofdev)
+  elseif (DARWIN OR LINUX)
+    set(NDOF_LIBRARY ndofdev)
+  endif (WINDOWS)
+
+  set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
+  set(NDOF_FOUND 1)
+endif (STANDALONE)
 
-if (WINDOWS)
-  set(NDOF_LIBRARY libndofdev)
-elseif (DARWIN OR LINUX)
-  set(NDOF_LIBRARY ndofdev)
-endif (WINDOWS)
+if (NDOF_FOUND)
+  add_definitions(-DLIB_NDOF=1)
+  include_directories(${NDOF_INCLUDE_DIR})
+else (NDOF_FOUND)
+  set(NDOF_INCLUDE_DIR "")
+  set(NDOF_LIBRARY "")
+endif (NDOF_FOUND)
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 0ac9fb2..b9efd57 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -2,11 +2,21 @@
 
 include(Variables)
 include(Linking)
+include(FindPkgConfig)
 
 set(OPENAL ON CACHE BOOL "Enable OpenAL")
 
+# If STANDALONE but NOT PKG_CONFIG_FOUND we should fail,
+# but why try to find it as prebuilt?
+if (OPENAL AND STANDALONE AND PKG_CONFIG_FOUND)
 
-if (OPENAL)
+  # This module defines
+  # OPENAL_INCLUDE_DIRS
+  # OPENAL_LIBRARIES
+  # OPENAL_FOUND
+  pkg_check_modules(OPENAL REQUIRED freealut)   # freealut links with openal.
+
+elseif (OPENAL)
 
   # message(STATUS "Building with OpenAL audio support")
 
@@ -21,11 +31,9 @@ if (OPENAL)
   
   elseif (DARWIN)
     # Look for for system's OpenAL.framework
-    find_library(OPENAL_LIB
-      NAMES openal.1
-      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-      NO_DEFAULT_PATH
-      )
+    # Nemu: This code has never looked for the system's OpenAL.framework
+    # Nemu: should it?
+    set(OPENAL_LIB ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.1.dylib)
   else (WINDOWS)
     set(OPENAL_LIB openal)
   endif (WINDOWS)
@@ -112,4 +120,4 @@ if (OPENAL)
     "Found OpenAL and ALUT libraries successfully"
     )
 
-endif (OPENAL)
+endif (OPENAL AND STANDALONE AND PKG_CONFIG_FOUND)
diff --git a/linden/indra/cmake/PluginAPI.cmake b/linden/indra/cmake/PluginAPI.cmake
new file mode 100644
index 0000000..d1649e8
--- /dev/null
+++ b/linden/indra/cmake/PluginAPI.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+
+if (WINDOWS)
+  set(PLUGIN_API_WINDOWS_LIBRARIES
+      wsock32
+      ws2_32
+      psapi
+      netapi32
+      advapi32
+      user32
+      )
+else (WINDOWS)
+  set(PLUGIN_API_WINDOWS_LIBRARIES "")
+endif (WINDOWS)
+
+
diff --git a/linden/indra/cmake/PulseAudio.cmake b/linden/indra/cmake/PulseAudio.cmake
new file mode 100644
index 0000000..f8087a8
--- /dev/null
+++ b/linden/indra/cmake/PulseAudio.cmake
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(PULSEAUDIO REQUIRED libpulse-mainloop-glib)
+
+elseif (LINUX)
+  use_prebuilt_binary(pulseaudio)
+  set(PULSEAUDIO_FOUND ON FORCE BOOL)
+  set(PULSEAUDIO_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      )
+  # We don't need to explicitly link against pulseaudio itself, because
+  # the viewer probes for the system's copy at runtime.
+  set(PULSEAUDIO_LIBRARIES
+    # none needed!
+    )
+endif (STANDALONE)
+
+if (PULSEAUDIO_FOUND)
+  set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.")
+endif (PULSEAUDIO_FOUND)
+
+if (PULSEAUDIO)
+  add_definitions(-DLL_PULSEAUDIO_ENABLED=1)
+endif (PULSEAUDIO)
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index 0901c1b..e4257f4 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -9,10 +9,12 @@ if (WINDOWS)
     NAMES python25.exe python23.exe python.exe
     NO_DEFAULT_PATH # added so that cmake does not find cygwin python
     PATHS
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
diff --git a/linden/indra/cmake/QuickTimePlugin.cmake b/linden/indra/cmake/QuickTimePlugin.cmake
new file mode 100644
index 0000000..1693d0f
--- /dev/null
+++ b/linden/indra/cmake/QuickTimePlugin.cmake
@@ -0,0 +1,48 @@
+# -*- cmake -*-
+
+if(INSTALL_PROPRIETARY)
+  include(Prebuilt)
+  use_prebuilt_binary(quicktime)
+endif(INSTALL_PROPRIETARY)
+
+if (DARWIN)
+  include(CMakeFindFrameworks)
+  find_library(QUICKTIME_LIBRARY QuickTime)
+elseif (WINDOWS)
+  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
+      CACHE PATH "Location of the QuickTime SDK.")
+
+  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
+               PATHS
+               ${ARCH_PREBUILT_DIRS_DEBUG}
+               "${QUICKTIME_SDK_DIR}\\libraries"
+               )
+
+  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
+               PATHS
+               ${ARCH_PREBUILT_DIRS_RELEASE}
+               "${QUICKTIME_SDK_DIR}\\libraries"
+               )
+
+  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
+    set(QUICKTIME_LIBRARY 
+        optimized ${RELEASE_QUICKTIME_LIBRARY}
+        debug ${DEBUG_QUICKTIME_LIBRARY}
+        )
+        
+  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
+  
+  include_directories(
+    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
+    "${QUICKTIME_SDK_DIR}\\CIncludes"
+    )
+endif (DARWIN)
+
+mark_as_advanced(QUICKTIME_LIBRARY)
+
+if (QUICKTIME_LIBRARY)
+  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
+else (QUICKTIME_LIBRARY)
+  message(STATUS "CMake cannot find the Quicktime SDK. Building without Quicktime support!")
+endif (QUICKTIME_LIBRARY)
+
diff --git a/linden/indra/cmake/Tut.cmake b/linden/indra/cmake/Tut.cmake
index 7488e9d..118c72e 100644
--- a/linden/indra/cmake/Tut.cmake
+++ b/linden/indra/cmake/Tut.cmake
@@ -1,6 +1,17 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+SET(TUT_FIND_REQUIRED FALSE)
+SET(TUT_FIND_QUIETLY TRUE)
+
+if (STANDALONE)
+  if (LL_TESTS)
+    SET(TUT_FIND_REQUIRED TRUE)
+  endif (LL_TESTS)
+  include(FindTut)
+  if (TUT_FOUND)
+    include_directories(${TUT_INCLUDE_DIR})
+  endif (TUT_FOUND)
+else (STANDALONE)
   use_prebuilt_binary(tut)
-endif(NOT STANDALONE)
+endif(STANDALONE)
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index 9d068c4..7a02dff 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -31,8 +31,9 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
-  use_prebuilt_binary(gtk-etc)
   if (LINUX)
+    use_prebuilt_binary(glib)           # gtk-etc needs glib
+    use_prebuilt_binary(gtk-etc)
     set(UI_LIBRARIES
         atk-1.0
         cairo
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 5d4dffe..eb9c004 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -45,6 +45,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   set(ARCH i686)
   set(LL_ARCH ${ARCH}_win32)
   set(LL_ARCH_DIR ${ARCH}-win32)
+  set(WORD_SIZE 32)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -60,17 +61,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   # set this dynamically from the build system now -
   # NOTE: wont have a distributable build unless you add this on the configure line with:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  #set(CMAKE_OSX_ARCHITECTURES i386;ppc)
-  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
-  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    set(ARCH universal)
-  else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH ppc)
-    else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH i386)
-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+    set(ARCH i386)
+  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
   set(LL_ARCH ${ARCH}_darwin)
   set(LL_ARCH_DIR universal-darwin)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7fe1040..38d0444 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,10 +4,20 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
-   if(LINUX AND ${ARCH} STREQUAL "x86_64")
+  if(LINUX)
+    if (${ARCH} STREQUAL "x86_64")
      use_prebuilt_binary(32bitcompatibilitylibs)
-   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
-  use_prebuilt_binary(fontconfig)
+        endif (${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(fontconfig)
+  endif(LINUX)
+else (NOT STANDALONE)
+  # Download there even when using standalone.
+  set(STANDALONE OFF)
+  use_prebuilt_binary(vivox)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(32bitcompatibilitylibs)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
+  set(STANDALONE ON)
 endif(NOT STANDALONE)
 
 if (WINDOWS)
diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
new file mode 100644
index 0000000..a4befa4
--- /dev/null
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -0,0 +1,79 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (STANDALONE)
+    # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
+    find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
+    include(${QT_USE_FILE})
+    set(QTDIR $ENV{QTDIR})
+    if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
+      message(FATAL_ERROR "\"${QT_BINARY_DIR}\" is unequal \"${QTDIR}/bin\"; "
+        "Qt is found by looking for qmake in your PATH. "
+        "Please set your PATH such that 'qmake' is found in \$QTDIR/bin, "
+        "or unset QTDIR if the found Qt is correct.")
+    endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
+    find_package(LLQtWebkit REQUIRED QUIET)
+    # Add the plugins.
+        set(QT_PLUGIN_LIBRARIES)
+        foreach(qlibname qgif qjpeg)
+      find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
+      if (QT_PLUGIN_${qlibname})
+            list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
+          else (QT_PLUGIN_${qtlibname})
+        message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
+      endif (QT_PLUGIN_${qlibname})
+    endforeach(qlibname)
+    # qjpeg depends on libjpeg
+    list(APPEND QT_PLUGIN_LIBRARIES jpeg)
+    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
+        qgif
+        qjpeg
+        QtWebKit
+        QtOpenGL
+        QtNetwork
+        QtGui
+        QtCore
+        jpeg
+        fontconfig
+        X11
+        Xrender
+        GL
+        )
+     endif (STANDALONE)
+endif (WINDOWS)
diff --git a/linden/indra/cmake/cmake_dummy.cpp b/linden/indra/cmake/cmake_dummy.cpp
new file mode 100644
index 0000000..25191e2
--- /dev/null
+++ b/linden/indra/cmake/cmake_dummy.cpp
@@ -0,0 +1,30 @@
+/** 
+ * @file cmake_dummy.cpp
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-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$
+ */