5 files changed, 13 insertions, 6 deletions

diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index ecb45bf..78b9d07 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -587,6 +587,8 @@ char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastNa
 char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From");
 char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange");
 char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
+char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX");
+char* _PREHASH_RegionSizeY = LLMessageStringTable::getInstance()->getString("RegionSizeY");
 char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle");
 char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges");
 char* _PREHASH_AgentCachedTextureResponse = LLMessageStringTable::getInstance()->getString("AgentCachedTextureResponse");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 8516483..64544dd 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -587,6 +587,8 @@ extern char * _PREHASH_LastName;
 extern char * _PREHASH_From;
 extern char * _PREHASH_RoleChange;
 extern char * _PREHASH_Port;
+extern char * _PREHASH_RegionSizeX;
+extern char * _PREHASH_RegionSizeY;
 extern char * _PREHASH_MemberTitle;
 extern char * _PREHASH_LogParcelChanges;
 extern char * _PREHASH_AgentCachedTextureResponse;
diff --git a/linden/indra/llmessage/patch_code.cpp b/linden/indra/llmessage/patch_code.cpp
index 90fb236..0cf8d2e 100644
--- a/linden/indra/llmessage/patch_code.cpp
+++ b/linden/indra/llmessage/patch_code.cpp
@@ -235,7 +235,7 @@ void	decode_patch_group_header(LLBitPack &bitpack, LLGroupHeader *gopp)
         gPatchSize = gopp->patch_size; 
 }
 
-void    decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph)
+void    decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_patch)
 {
         U8 retvalu8;
 
@@ -274,15 +274,18 @@ void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph)
 #endif
         ph->range = retvalu16;
 
-        retvalu16 = 0;
+        retvalu32 = 0;
 #ifdef LL_BIG_ENDIAN
         ret = (U8 *)&retvalu16;
         bitpack.bitUnpack(&(ret[1]), 8);
         bitpack.bitUnpack(&(ret[0]), 2);
 #else
-        bitpack.bitUnpack((U8 *)&retvalu16, 10);
+        if (b_large_patch)
+                bitpack.bitUnpack((U8 *)&retvalu32, 32);
+        else
+                bitpack.bitUnpack((U8 *)&retvalu32, 10);
 #endif
-        ph->patchids = retvalu16;
+        ph->patchids = retvalu32;
 
         gWordBits = (ph->quant_wbits & 0xf) + 2;
 }
diff --git a/linden/indra/llmessage/patch_code.h b/linden/indra/llmessage/patch_code.h
index 82fa6bb..dbfdf70 100644
--- a/linden/indra/llmessage/patch_code.h
+++ b/linden/indra/llmessage/patch_code.h
@@ -46,7 +46,7 @@ void	end_patch_coding(LLBitPack &bitpack);
 
 void    init_patch_decoding(LLBitPack &bitpack);
 void    decode_patch_group_header(LLBitPack &bitpack, LLGroupHeader *gopp);
-void    decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph);
+void    decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_patch);
 void    decode_patch(LLBitPack &bitpack, S32 *patches);
 
 #endif
diff --git a/linden/indra/llmessage/patch_dct.h b/linden/indra/llmessage/patch_dct.h
index 663e146..ba21be7 100644
--- a/linden/indra/llmessage/patch_dct.h
+++ b/linden/indra/llmessage/patch_dct.h
@@ -79,7 +79,7 @@ public:
         F32     dc_offset;              // 4 bytes
         U16     range;                  // 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch)
         U8      quant_wbits;    // 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2)
-        U16     patchids;               // 2 = 10 (actually only uses 10 bits, 5 for each)
+        U32     patchids;               // 2 = 10 (actually only uses 10 bits, 5 for each)
 };
 
 // Compression routines