diff options
| author | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
| commit | 24b26d71ee01211aa796b8061b66ec06a133e4ce (patch) | |
| tree | 96bffcd019c933ad3ebbfd5f096968108b22aab5 /indra/llmessage/message_prehash.cpp | |
| parent | 5dfd435872e36445dcc82f99443dfc5a7ee0805a (diff) | |
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
Diffstat (limited to 'indra/llmessage/message_prehash.cpp')
| -rw-r--r-- | indra/llmessage/message_prehash.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp index d554ec2f34..716d895334 100644 --- a/indra/llmessage/message_prehash.cpp +++ b/indra/llmessage/message_prehash.cpp @@ -314,6 +314,7 @@ char* _PREHASH_TextColor = LLMessageStringTable::getInstance()->getString("TextC char* _PREHASH_SlaveID = LLMessageStringTable::getInstance()->getString("SlaveID"); char* _PREHASH_Charter = LLMessageStringTable::getInstance()->getString("Charter"); char* _PREHASH_AlertData = LLMessageStringTable::getInstance()->getString("AlertData"); +char* _PREHASH_AlertInfo = LLMessageStringTable::getInstance()->getString("AlertInfo"); char* _PREHASH_TargetBlock = LLMessageStringTable::getInstance()->getString("TargetBlock"); char* _PREHASH_CheckParcelAuctions = LLMessageStringTable::getInstance()->getString("CheckParcelAuctions"); char* _PREHASH_ParcelAuctions = LLMessageStringTable::getInstance()->getString("ParcelAuctions"); @@ -1375,4 +1376,6 @@ char* _PREHASH_AgeVerificationBlock = LLMessageStringTable::getInstance()->getSt char* _PREHASH_UCoord = LLMessageStringTable::getInstance()->getString("UCoord"); char* _PREHASH_VCoord = LLMessageStringTable::getInstance()->getString("VCoord"); char* _PREHASH_FaceIndex = LLMessageStringTable::getInstance()->getString("FaceIndex"); +char* _PREHASH_StatusData = LLMessageStringTable::getInstance()->getString("StatusData"); + |