Merge pull request #4915 from RyeMutt/rye/linux64-2

Linux64 Part 2

3 files changed, 4 insertions, 24 deletions

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/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);