llmessage v2 merge.

2011-07-15 02:04:57 -05:00
parent 7e0ee6bb71
commit 3fbfeb2de5
8 changed files with 124 additions and 261 deletions
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -67,9 +67,6 @@

 #include "llstoredmessage.h"
 #include "llsocks5.h"
-// <edit>
-#include "llnetcanary.h"
-// </edit>

 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;