Merge branch '1.3-maint' into next

Conflicts:
	linden/indra/llcommon/CMakeLists.txt
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/viewer_manifest.py

7 files changed, 81 insertions, 16 deletions

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index bad35a9..b2532be 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,38 @@
 
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.3.2                          -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+    CHANGES
+
+      This version of Imprudence includes the following changes,
+      as compared to Imprudence 1.3.1.
+
+      * Updated the ogg-vorbis libraries to address an exploit that
+        allowed attackers to crash the viewer. libogg is now version
+        1.2.2; libvorbis is now version 1.3.2.
+
+      * Fixed VWR-25479: Avatar physics causing broken shapes on other
+        viewers. Thanks for the patch, Seraph Linden!
+
+      * Fixed the Vivox Acceptable Use Policy window appearing under
+        the wrong conditions.
+
+      * Fixed voice chat always being disabled at startup, even if you
+        had enabled it in your Preferences in the previous session.
+
+      * Fixed a startup error related to "libz.so" on certain Linux
+        distros. (IMP-790)
+
+      * Fixed the viewer encountering an error: "Vertex buffer
+        destroyed while mapped!"
+
+      * Tweaked the compile system so the viewer can link using "gold".
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                         1.3.1                          -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
diff --git a/linden/indra/cmake/Audio.cmake b/linden/indra/cmake/Audio.cmake
index d23bc2f..10d11bb 100644
--- a/linden/indra/cmake/Audio.cmake
+++ b/linden/indra/cmake/Audio.cmake
@@ -32,6 +32,12 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    set(VORBIS_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(VORBISENC_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(VORBISFILE_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(OGG_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
 endif (STANDALONE)
 
 link_directories(
@@ -40,3 +46,13 @@ link_directories(
     ${VORBISFILE_LIBRARY_DIRS}
     ${OGG_LIBRARY_DIRS}
     )
+
+if(NOT vorbis_link_msg)
+  set(vorbis_link_msg ON CACHE BOOL "ogg vorbis linked from:\n")
+  message("ogg vorbis linked from:\n"
+    ${VORBIS_LIBRARY_DIRS} "\n"
+    ${VORBISENC_LIBRARY_DIRS} "\n"
+    ${VORBISFILE_LIBRARY_DIRS} "\n"
+    ${OGG_LIBRARY_DIRS} "\n"
+  )
+endif(NOT vorbis_link_msg)
diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake
index 1023693..345359a 100644
--- a/linden/indra/cmake/LLWindow.cmake
+++ b/linden/indra/cmake/LLWindow.cmake
@@ -45,4 +45,7 @@ else (SERVER AND LINUX)
           comdlg32
           )
   endif (WINDOWS)
+  if (LINUX)
+    list(APPEND LLWINDOW_LIBRARIES fontconfig)
+  endif (LINUX)
 endif (SERVER AND LINUX)
diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index ed04ca6..b6015a8 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -200,7 +200,7 @@ set_source_files_properties(${llcommon_HEADER_FILES}
 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
 add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
-target_link_libraries(
+set (llcommon_link_LIBRARIES
     llcommon
     ${APRUTIL_LIBRARIES}
     ${APR_LIBRARIES}
@@ -218,3 +218,11 @@ if (DARWIN)
     INSTALL_NAME_DIR "@executable_path/../Resources"
     )
 endif (DARWIN)
+
+if (LINUX)
+  list(APPEND llcommon_link_LIBRARIES rt)
+endif (LINUX)
+
+target_link_libraries(
+    ${llcommon_link_LIBRARIES}
+    )
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index b3f2b4c..61b6418 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -208,13 +208,21 @@ set_source_files_properties(${llmessage_HEADER_FILES}
 list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
 
 add_library (llmessage ${llmessage_SOURCE_FILES})
-target_link_libraries(
+set (llmessage_link_LIBRARIES
     llmessage
     ${CURL_LIBRARIES}
     ${CARES_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
+)
+if (LINUX)
+  list(APPEND llmessage_link_LIBRARIES pthread)
+endif (LINUX)
+
+target_link_libraries(
+    ${llmessage_link_LIBRARIES}
+
     )
 
 IF (NOT LINUX AND VIEWER)
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3ba94fa..ed51a24 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -8754,7 +8754,6 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 
                                 if( !param )
                                 {
-                                        llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
                                         break;
                                 }
 
@@ -8796,10 +8795,9 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
                         }
                 }
 
-                S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
-                if (num_blocks != expected_tweakable_count)
+                while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
                 {
-                        llinfos << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. Object: " << getID() << llendl;
+                        param = getNextVisualParam();
                 }
 
                 if (params_changed)
diff --git a/linden/install.xml b/linden/install.xml
index 7ff8dc0..90d0ae5 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1151,9 +1151,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
       <key>ogg-vorbis</key>
       <map>
         <key>copyright</key>
-        <string>Copyright (C) 2008 Xiph.org Foundation</string>
+        <string>Copyright (C) Xiph.org Foundation</string>
         <key>description</key>
-        <string>Ogg: container format Vorbis: audio compression scheme</string>
+        <string>Ogg: container format; Vorbis: audio compression scheme</string>
         <key>license</key>
         <string>xiph-bsd</string>
         <key>packages</key>
@@ -1161,30 +1161,30 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>88eec3965fc2384436192faef1db2629</string>
+            <string>30c75ce29c2ce2f6e8063067db31989d</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-darwin-20100620.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-darwin-1.2.2-1.3.2-20110517.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>72bde567859934024c8a4a70b97b24f5</string>
+            <string>a132634c28f0d7fb0e7e4f62c82a0579</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091115.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-linux-1.2.2-1.3.2-20110514.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>83c72b57a95e8c42560fb67955169f19</string>
+            <string>dded849d4d46fb5d94f088c86407ec98</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux64-20091202.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-linux64-1.2.2-1.3.2-20110514.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>9bf1fea65e66b2cd3075e6ffd7eb57ad</string>
+            <string>946bab72f6774220eaf139ce378ba671</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.1.3-1.2.0-windows-20080723.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-windows-1.2.2-1.3.2-20110511.tar.bz2</uri>
           </map>
         </map>
       </map>