Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llstartup.cpp

10 files changed, 18 insertions, 25 deletions

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index b2757a7306..46f28abc9c 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -194,6 +194,10 @@ target_link_libraries(
 )
 target_include_directories( llmessage  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
+if (USE_PRECOMPILED_HEADERS)
+  target_precompile_headers(llmessage REUSE_FROM llprecompiled)
+endif ()
+
 # tests
 if (LL_TESTS)
   SET(llmessage_TEST_SOURCE_FILES
diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h
index eec966d51b..86b2931ed9 100644
--- a/indra/llmessage/llavatarname.h
+++ b/indra/llmessage/llavatarname.h
@@ -32,7 +32,7 @@
 
 class LLSD;
 
-class LL_COMMON_API LLAvatarName
+class LLAvatarName
 {
 public:
     LLAvatarName();
diff --git a/indra/llmessage/llbufferstream.cpp b/indra/llmessage/llbufferstream.cpp
index 2c745f6fe4..cb5a4c1824 100644
--- a/indra/llmessage/llbufferstream.cpp
+++ b/indra/llmessage/llbufferstream.cpp
@@ -234,17 +234,10 @@ int LLBufferStreamBuf::sync()
 }
 
 // virtual
-#if( LL_WINDOWS || __GNUC__ > 2)
 LLBufferStreamBuf::pos_type LLBufferStreamBuf::seekoff(
     LLBufferStreamBuf::off_type off,
     std::ios::seekdir way,
     std::ios::openmode which)
-#else
-streampos LLBufferStreamBuf::seekoff(
-    streamoff off,
-    std::ios::seekdir way,
-    std::ios::openmode which)
-#endif
 {
     if(!mBuffer
        || ((way == std::ios::beg) && (off < 0))
@@ -319,12 +312,8 @@ streampos LLBufferStreamBuf::seekoff(
         }
     }
 
-#if( LL_WINDOWS || __GNUC__ > 2 )
     S32 rv = (S32)(intptr_t)address;
     return (pos_type)rv;
-#else
-    return (streampos)address;
-#endif
 }
 
 
diff --git a/indra/llmessage/llbufferstream.h b/indra/llmessage/llbufferstream.h
index ac1aa49e81..e0a7d8c642 100644
--- a/indra/llmessage/llbufferstream.h
+++ b/indra/llmessage/llbufferstream.h
@@ -48,10 +48,8 @@ public:
     virtual ~LLBufferStreamBuf();
 
 protected:
-#if( LL_WINDOWS || __GNUC__ > 2 )
     typedef std::streambuf::pos_type pos_type;
     typedef std::streambuf::off_type off_type;
-#endif
 
     /* @name streambuf vrtual implementations
      */
@@ -87,17 +85,10 @@ protected:
      * or both masked together.
      * @return Returns the new position or an invalid position on failure.
      */
-#if( LL_WINDOWS || __GNUC__ > 2)
     virtual pos_type seekoff(
         off_type off,
         std::ios::seekdir way,
         std::ios::openmode which);
-#else
-    virtual streampos seekoff(
-        streamoff off,
-        std::ios::seekdir way,
-        std::ios::openmode which);
-#endif
 
     /*
      * @brief Get s sequence of characters from the input
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 64f660d0ce..4980e0a1da 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -780,6 +780,7 @@ void LLCacheName::Impl::processPendingAsks()
 void LLCacheName::Impl::processPendingReplies()
 {
     // First call all the callbacks, because they might send messages.
+    // Todo: needs cleanup logic, otherwise invalid ids might stay here indefinitely
     for(ReplyQueue::iterator it = mReplyQueue.begin(); it != mReplyQueue.end(); ++it)
     {
         PendingReply* reply = *it;
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
index 78cca47456..9d940d8d71 100644
--- a/indra/llmessage/llexperiencecache.cpp
+++ b/indra/llmessage/llexperiencecache.cpp
@@ -23,6 +23,8 @@
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
+#include "linden_common.h"
+
 #include "llexperiencecache.h"
 
 #include "llavatarname.h"
diff --git a/indra/llmessage/llpartdata.cpp b/indra/llmessage/llpartdata.cpp
index d4cf95c1e3..b626637862 100644
--- a/indra/llmessage/llpartdata.cpp
+++ b/indra/llmessage/llpartdata.cpp
@@ -331,7 +331,7 @@ bool LLPartSysData::isNullPS(const S32 block_num)
 
     S32 size;
     // Check size of block
-    size = gMessageSystem->getSize("ObjectData", block_num, "PSBlock");
+    size = gMessageSystem->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_PSBlock);
 
     if (!size)
     {
@@ -344,7 +344,7 @@ bool LLPartSysData::isNullPS(const S32 block_num)
         return true;
     }
 
-    gMessageSystem->getBinaryData("ObjectData", "PSBlock", ps_data_block, size, block_num, PS_MAX_DATA_BLOCK_SIZE);
+    gMessageSystem->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_PSBlock, ps_data_block, size, block_num, PS_MAX_DATA_BLOCK_SIZE);
 
     LLDataPackerBinaryBuffer dp(ps_data_block, size);
     if (size > PS_LEGACY_DATA_BLOCK_SIZE)
@@ -373,7 +373,7 @@ bool LLPartSysData::unpackBlock(const S32 block_num)
     U8 ps_data_block[PS_MAX_DATA_BLOCK_SIZE];
 
     // Check size of block
-    S32 size = gMessageSystem->getSize("ObjectData", block_num, "PSBlock");
+    S32 size = gMessageSystem->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_PSBlock);
 
     if (size > PS_MAX_DATA_BLOCK_SIZE)
     {
@@ -382,7 +382,7 @@ bool LLPartSysData::unpackBlock(const S32 block_num)
     }
 
     // Get from message
-    gMessageSystem->getBinaryData("ObjectData", "PSBlock", ps_data_block, size, block_num, PS_MAX_DATA_BLOCK_SIZE);
+    gMessageSystem->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_PSBlock, ps_data_block, size, block_num, PS_MAX_DATA_BLOCK_SIZE);
 
     LLDataPackerBinaryBuffer dp(ps_data_block, size);
 
diff --git a/indra/llmessage/llstoredmessage.cpp b/indra/llmessage/llstoredmessage.cpp
index 39696ea235..ff8afde657 100644
--- a/indra/llmessage/llstoredmessage.cpp
+++ b/indra/llmessage/llstoredmessage.cpp
@@ -24,6 +24,8 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
+
 #include "llstoredmessage.h"
 
 LLStoredMessage::LLStoredMessage(const std::string& name, const LLSD& message) : mMessage(message), mName(name)
diff --git a/indra/llmessage/lltemplatemessagedispatcher.cpp b/indra/llmessage/lltemplatemessagedispatcher.cpp
index edbeb4acc1..02e5b56c8d 100644
--- a/indra/llmessage/lltemplatemessagedispatcher.cpp
+++ b/indra/llmessage/lltemplatemessagedispatcher.cpp
@@ -24,6 +24,7 @@
  * $/LicenseInfo$
  */
 
+#include "linden_common.h"
 
 #include "lltemplatemessagedispatcher.h"
 
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index b62288590e..850d73e910 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -118,6 +118,9 @@ void LLTemplateMessageReader::getData(const char *blockname, const char *varname
     {
         switch( vardata_size )
         {
+        case 0:
+            // This is here to prevent a memcpy from a null value which is undefined behavior.
+            break;
         case 1:
             *((U8*)datap) = *((U8*)vardata.getData());
             break;