aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage
diff options
context:
space:
mode:
authorJacek Antonelli2011-03-18 21:05:23 -0500
committerJacek Antonelli2011-03-18 21:50:25 -0500
commite67e3f216fdb0868d05c35f105dd83c5358dd3b0 (patch)
tree4de6be204ab09d635c1e4ca2215abd2c17ae6671 /linden/indra/llmessage
parentFix a bug that only occurs when not running in a debugger. (diff)
downloadmeta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.zip
meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.gz
meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.bz2
meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.xz
Fixed bad line endings (CRLF) in many files.
Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
Diffstat (limited to '')
-rw-r--r--linden/indra/llmessage/message_prehash.cpp4
-rw-r--r--linden/indra/llmessage/message_prehash.h4
-rw-r--r--linden/indra/llmessage/patch_code.cpp10
3 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index a8b021f..78b9d07 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -586,8 +586,8 @@ char* _PREHASH_NotecardItemID = LLMessageStringTable::getInstance()->getString("
586char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastName"); 586char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastName");
587char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From"); 587char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From");
588char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange"); 588char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange");
589char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port"); 589char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
590char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX"); 590char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX");
591char* _PREHASH_RegionSizeY = LLMessageStringTable::getInstance()->getString("RegionSizeY"); 591char* _PREHASH_RegionSizeY = LLMessageStringTable::getInstance()->getString("RegionSizeY");
592char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle"); 592char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle");
593char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges"); 593char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index adf27ee..64544dd 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -586,8 +586,8 @@ extern char * _PREHASH_NotecardItemID;
586extern char * _PREHASH_LastName; 586extern char * _PREHASH_LastName;
587extern char * _PREHASH_From; 587extern char * _PREHASH_From;
588extern char * _PREHASH_RoleChange; 588extern char * _PREHASH_RoleChange;
589extern char * _PREHASH_Port; 589extern char * _PREHASH_Port;
590extern char * _PREHASH_RegionSizeX; 590extern char * _PREHASH_RegionSizeX;
591extern char * _PREHASH_RegionSizeY; 591extern char * _PREHASH_RegionSizeY;
592extern char * _PREHASH_MemberTitle; 592extern char * _PREHASH_MemberTitle;
593extern char * _PREHASH_LogParcelChanges; 593extern char * _PREHASH_LogParcelChanges;
diff --git a/linden/indra/llmessage/patch_code.cpp b/linden/indra/llmessage/patch_code.cpp
index 4b4313d..0cf8d2e 100644
--- a/linden/indra/llmessage/patch_code.cpp
+++ b/linden/indra/llmessage/patch_code.cpp
@@ -280,11 +280,11 @@ void decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_pat
280 bitpack.bitUnpack(&(ret[1]), 8); 280 bitpack.bitUnpack(&(ret[1]), 8);
281 bitpack.bitUnpack(&(ret[0]), 2); 281 bitpack.bitUnpack(&(ret[0]), 2);
282#else 282#else
283 if (b_large_patch) 283 if (b_large_patch)
284 bitpack.bitUnpack((U8 *)&retvalu32, 32); 284 bitpack.bitUnpack((U8 *)&retvalu32, 32);
285 else 285 else
286 bitpack.bitUnpack((U8 *)&retvalu32, 10); 286 bitpack.bitUnpack((U8 *)&retvalu32, 10);
287#endif 287#endif
288 ph->patchids = retvalu32; 288 ph->patchids = retvalu32;
289 289
290 gWordBits = (ph->quant_wbits & 0xf) + 2; 290 gWordBits = (ph->quant_wbits & 0xf) + 2;