Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

18 files changed, 81 insertions, 140 deletions

diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index 2563a98..088b3e6 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -23,6 +23,10 @@ else (STANDALONE)
       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 "")
   elseif (DARWIN)
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 452292a..0c16d9f 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -174,10 +174,9 @@ set(all_targets ${all_targets} ${out_targets})
 
 set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
-    tntk.dll
-    libeay32.dll
-    ssleay32.dll
-    srtp.dll
+    SLVoice.exe
+    alut.dll
+    vivoxsdk.dll
     ortp.dll
     wrap_oal.dll
     )
@@ -393,6 +392,37 @@ if (MSVC80)
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
         )
 
+# Copy MS C runtime dlls, required for packaging.
+# *TODO - Adapt this to support VC9
+if (MSVC80)
+    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+        PATHS
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+        NO_DEFAULT_PATH
+        )
+
+    if(EXISTS ${debug_msvc8_redist_path})
+        set(debug_msvc8_files
+            msvcr80d.dll
+            msvcp80d.dll
+            Microsoft.VC80.DebugCRT.manifest
+            )
+
+        copy_if_different(
+            ${debug_msvc8_redist_path} 
+            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+            out_targets 
+            ${debug_msvc8_files}
+            )
+        set(all_targets ${all_targets} ${out_targets})
+    endif (EXISTS ${debug_msvc8_redist_path})
+
+    FIND_PATH(release_msvc8_redist_path msvcr80.dll
+        PATHS
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+        NO_DEFAULT_PATH
+        )
+
     if(EXISTS ${release_msvc8_redist_path})
         set(release_msvc8_files
             msvcr80.dll
@@ -419,4 +449,4 @@ if (MSVC80)
     endif (EXISTS ${release_msvc8_redist_path})
 endif (MSVC80)
 
-add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
\ No newline at end of file
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake
new file mode 100644
index 0000000..cfc4ccd
--- /dev/null
+++ b/linden/indra/cmake/DBusGlib.cmake
@@ -0,0 +1,29 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
+
+elseif (LINUX)
+  use_prebuilt_binary(dbusglib)
+  set(DBUSGLIB_FOUND ON FORCE BOOL)
+  set(DBUSGLIB_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      )
+  # We don't need to explicitly link against dbus-glib itself, because
+  # the viewer probes for the system's copy at runtime.
+  set(DBUSGLIB_LIBRARIES
+      gobject-2.0
+      glib-2.0
+      )
+endif (STANDALONE)
+
+if (DBUSGLIB_FOUND)
+  set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")
+endif (DBUSGLIB_FOUND)
+
+if (DBUSGLIB)
+  add_definitions(-DLL_DBUS_ENABLED=1)
+endif (DBUSGLIB)
diff --git a/linden/indra/cmake/LLCharacter.cmake b/linden/indra/cmake/LLCharacter.cmake
index c74092c..9b2f5c4 100644
--- a/linden/indra/cmake/LLCharacter.cmake
+++ b/linden/indra/cmake/LLCharacter.cmake
@@ -4,6 +4,4 @@ set(LLCHARACTER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcharacter
     )
 
-set(LLCHARACTER_LIBRARIES
-    llcharacter
-    )
+set(LLCHARACTER_LIBRARIES llcharacter)
diff --git a/linden/indra/cmake/LLCommon.cmake b/linden/indra/cmake/LLCommon.cmake
index f4b251e..410766e 100644
--- a/linden/indra/cmake/LLCommon.cmake
+++ b/linden/indra/cmake/LLCommon.cmake
@@ -12,10 +12,4 @@ set(LLCOMMON_INCLUDE_DIRS
     ${Boost_INCLUDE_DIRS}
     )
 
-set(LLCOMMON_LIBRARIES
-    llcommon
-    ${APRUTIL_LIBRARIES}
-    ${APR_LIBRARIES}
-    ${EXPAT_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-    )
+set(LLCOMMON_LIBRARIES llcommon)
diff --git a/linden/indra/cmake/LLCrashLogger.cmake b/linden/indra/cmake/LLCrashLogger.cmake
index 7b362d0..f2cb83e 100644
--- a/linden/indra/cmake/LLCrashLogger.cmake
+++ b/linden/indra/cmake/LLCrashLogger.cmake
@@ -4,6 +4,4 @@ set(LLCRASHLOGGER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcrashlogger
     )
 
-set(LLCRASHLOGGER_LIBRARIES
-    llcrashlogger
-    )
+set(LLCRASHLOGGER_LIBRARIES llcrashlogger)
diff --git a/linden/indra/cmake/LLDatabase.cmake b/linden/indra/cmake/LLDatabase.cmake
index c3cf622..6526101 100644
--- a/linden/indra/cmake/LLDatabase.cmake
+++ b/linden/indra/cmake/LLDatabase.cmake
@@ -7,7 +7,4 @@ set(LLDATABASE_INCLUDE_DIRS
     ${MYSQL_INCLUDE_DIR}
     )
 
-set(LLDATABASE_LIBRARIES
-    lldatabase
-    ${MYSQL_LIBRARIES}
-    )
+set(LLDATABASE_LIBRARIES lldatabase)
diff --git a/linden/indra/cmake/LLImage.cmake b/linden/indra/cmake/LLImage.cmake
index 8874fa5..ec3da89 100644
--- a/linden/indra/cmake/LLImage.cmake
+++ b/linden/indra/cmake/LLImage.cmake
@@ -8,8 +8,4 @@ set(LLIMAGE_INCLUDE_DIRS
     ${JPEG_INCLUDE_DIRS}
     )
 
-set(LLIMAGE_LIBRARIES
-    llimage
-    ${JPEG_LIBRARIES}
-    ${PNG_LIBRARIES}
-    )
+set(LLIMAGE_LIBRARIES llimage)
diff --git a/linden/indra/cmake/LLImageJ2COJ.cmake b/linden/indra/cmake/LLImageJ2COJ.cmake
index 91973e0..1bcf205 100644
--- a/linden/indra/cmake/LLImageJ2COJ.cmake
+++ b/linden/indra/cmake/LLImageJ2COJ.cmake
@@ -2,7 +2,4 @@
 
 include(OpenJPEG)
 
-set(LLIMAGEJ2COJ_LIBRARIES
-    llimagej2coj
-    ${OPENJPEG_LIBRARIES}
-    )
+set(LLIMAGEJ2COJ_LIBRARIES llimagej2coj)
diff --git a/linden/indra/cmake/LLInventory.cmake b/linden/indra/cmake/LLInventory.cmake
index 7d5f492..c3dc077 100644
--- a/linden/indra/cmake/LLInventory.cmake
+++ b/linden/indra/cmake/LLInventory.cmake
@@ -4,6 +4,4 @@ set(LLINVENTORY_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llinventory
     )
 
-set(LLINVENTORY_LIBRARIES
-    llinventory
-    )
+set(LLINVENTORY_LIBRARIES llinventory)
diff --git a/linden/indra/cmake/LLMath.cmake b/linden/indra/cmake/LLMath.cmake
index 8afd45e..893920a 100644
--- a/linden/indra/cmake/LLMath.cmake
+++ b/linden/indra/cmake/LLMath.cmake
@@ -4,6 +4,4 @@ set(LLMATH_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmath
     )
 
-set(LLMATH_LIBRARIES
-    llmath
-    )
+set(LLMATH_LIBRARIES llmath)
diff --git a/linden/indra/cmake/LLMessage.cmake b/linden/indra/cmake/LLMessage.cmake
index 1cea03a..0143d04 100644
--- a/linden/indra/cmake/LLMessage.cmake
+++ b/linden/indra/cmake/LLMessage.cmake
@@ -12,11 +12,4 @@ set(LLMESSAGE_INCLUDE_DIRS
     ${OPENSSL_INCLUDE_DIRS}
     )
 
-set(LLMESSAGE_LIBRARIES
-    llmessage
-    ${CURL_LIBRARIES}
-    ${CARES_LIBRARIES}
-    ${OPENSSL_LIBRARIES}
-    ${CRYPTO_LIBRARIES}
-    ${XMLRPCEPI_LIBRARIES}
-    )
+set(LLMESSAGE_LIBRARIES llmessage)
diff --git a/linden/indra/cmake/LLPhysics.cmake b/linden/indra/cmake/LLPhysics.cmake
deleted file mode 100644
index 3ae390e..0000000
--- a/linden/indra/cmake/LLPhysics.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-use_prebuilt_binary(havok)
-
-set(HAVOK_VERSION 460)
-
-set(LLPHYSICS_INCLUDE_DIRS
-    ${LIBS_SERVER_DIR}/llphysics
-    ${LIBS_PREBUILT_DIR}/include/havok/hk${HAVOK_VERSION}/common
-    ${LIBS_PREBUILT_DIR}/include/havok/hk${HAVOK_VERSION}/physics
-    )
-
-add_definitions(-DLL_CURRENT_HAVOK_VERSION=${HAVOK_VERSION})
-
-if (LINUX OR DARWIN)
-  if (DARWIN)
-    link_directories(
-        ${LIBS_PREBUILT_DIR}/universal-darwin/lib_release/havok/hk460
-        )
-  else (DARWIN)
-    link_directories(
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release/havok/hk460
-        )
-  endif (DARWIN)
-
-  set(LLPHYSICS_LIBRARIES 
-      llphysics
-      hkcompat 
-      hkutilities 
-      hkvisualize 
-      hkdynamics 
-      hkvehicle 
-      hkcollide 
-      hkinternal 
-      hkconstraintsolver 
-      hkmath 
-      hkscenedata 
-      hkserialize 
-      hkgraphicsogl 
-      hkgraphicsbridge 
-      hkgraphics 
-      hkdemoframework 
-      hkbase
-      )
-elseif (WINDOWS)
-  if (MSVC71)
-    set(HK_DEBUG ${WINLIBS_PREBUILT_DEBUG_DIR}/havok/hk460)
-    set(HK_RELEASE ${WINLIBS_PREBUILT_RELEASE_DIR}/havok/hk460)
-  else (MSVC71)
-    set(HK_DEBUG ${WINLIBS_PREBUILT_DEBUG_DIR}/havok/hk460_net_8-0)
-    set(HK_RELEASE ${WINLIBS_PREBUILT_RELEASE_DIR}/havok/hk460_net_8-0)
-  endif (MSVC71)
-
-  set(HAVOK_LIBS
-      hkbase
-      hkdynamics
-      hkmath
-      hkcollide
-      hkutilities
-      hkvisualize
-      hkinternal
-      hkconstraintsolver
-      hkcompat
-      hkserialize
-      hkvehicle
-      hkscenedata
-      )
-
-  set(LLPHYSICS_LIBRARIES llphysics)
-
-  foreach(lib ${HAVOK_LIBS})
-    list(APPEND LLPHYSICS_LIBRARIES 
-         debug ${HK_DEBUG}/${lib} optimized ${HK_RELEASE}/${lib})
-  endforeach(lib)
-endif (LINUX OR DARWIN)
diff --git a/linden/indra/cmake/LLPrimitive.cmake b/linden/indra/cmake/LLPrimitive.cmake
index 0426ae5..d397b78 100644
--- a/linden/indra/cmake/LLPrimitive.cmake
+++ b/linden/indra/cmake/LLPrimitive.cmake
@@ -4,6 +4,4 @@ set(LLPRIMITIVE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llprimitive
     )
 
-set(LLPRIMITIVE_LIBRARIES
-    llprimitive
-    )
+set(LLPRIMITIVE_LIBRARIES llprimitive)
diff --git a/linden/indra/cmake/LLScene.cmake b/linden/indra/cmake/LLScene.cmake
index d1c32b3..96ad508 100644
--- a/linden/indra/cmake/LLScene.cmake
+++ b/linden/indra/cmake/LLScene.cmake
@@ -4,6 +4,4 @@ set(LLSCENE_INCLUDE_DIRS
     ${LIBS_SERVER_DIR}/llscene
     )
 
-set(LLSCENE_LIBRARIES
-    llscene
-    )
+set(LLSCENE_LIBRARIES llscene)
diff --git a/linden/indra/cmake/LLUI.cmake b/linden/indra/cmake/LLUI.cmake
index d1287de..34de571 100644
--- a/linden/indra/cmake/LLUI.cmake
+++ b/linden/indra/cmake/LLUI.cmake
@@ -4,6 +4,4 @@ set(LLUI_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llui
     )
 
-set(LLUI_LIBRARIES
-    llui
-    )
+set(LLUI_LIBRARIES llui)
diff --git a/linden/indra/cmake/LLVFS.cmake b/linden/indra/cmake/LLVFS.cmake
index 5ce3d25..0fe87cd 100644
--- a/linden/indra/cmake/LLVFS.cmake
+++ b/linden/indra/cmake/LLVFS.cmake
@@ -5,9 +5,3 @@ set(LLVFS_INCLUDE_DIRS
     )
 
 set(LLVFS_LIBRARIES llvfs)
-
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(CARBON_LIBRARY Carbon)
-  list(APPEND LLVFS_LIBRARIES ${CARBON_LIBRARY})
-endif (DARWIN)
diff --git a/linden/indra/cmake/LLXML.cmake b/linden/indra/cmake/LLXML.cmake
index dd2ebca..64dfdb6 100644
--- a/linden/indra/cmake/LLXML.cmake
+++ b/linden/indra/cmake/LLXML.cmake
@@ -9,7 +9,4 @@ set(LLXML_INCLUDE_DIRS
     ${EXPAT_INCLUDE_DIRS}
     )
 
-set(LLXML_LIBRARIES
-    llxml
-    ${EXPAT_LIBRARIES}
-    )
+set(LLXML_LIBRARIES llxml)