diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-04-19 18:02:56 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-04-19 18:02:56 -0700 |
commit | 41357bb01297ce0977da7a3e2e9308d3c903d3a8 (patch) | |
tree | cf677aea0a81ecddbb394e64c9bd07db517880af /indra/llmessage/message_prehash.cpp | |
parent | c3fa45282f5bdb0cb7a3fcd680154e88cafde4bb (diff) | |
parent | 3a7490e492b35d5dc55f6124d2e1acbca3bd4d79 (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/llmessage/message_prehash.cpp')
-rw-r--r-- | indra/llmessage/message_prehash.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp index 9e3986f257..a118e21ffb 100644 --- a/indra/llmessage/message_prehash.cpp +++ b/indra/llmessage/message_prehash.cpp @@ -1147,7 +1147,7 @@ char* _PREHASH_ForceObjectSelect = LLMessageStringTable::getInstance()->getStrin char* _PREHASH_Price = LLMessageStringTable::getInstance()->getString("Price"); char* _PREHASH_SunDirection = LLMessageStringTable::getInstance()->getString("SunDirection"); char* _PREHASH_FromName = LLMessageStringTable::getInstance()->getString("FromName"); -char* _PREHASH_ChangeInventoryItemFlags = LLMessageStringTable::getInstance()->getString("ChangeInventoryItemFlags"); +char* _PREHASH_ChangeInventoryItemFlags = LLMessageStringTable::getInstance()->getString("ChangLLInventoryItemFlags"); char* _PREHASH_Force = LLMessageStringTable::getInstance()->getString("Force"); char* _PREHASH_TransactionBlock = LLMessageStringTable::getInstance()->getString("TransactionBlock"); char* _PREHASH_PowersMask = LLMessageStringTable::getInstance()->getString("PowersMask"); |