5 files changed, 39 insertions, 6 deletions

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)