diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 16:10:16 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 16:10:16 +0100 |
commit | 1dade05ee77d01f88544984735d638542b42c1d1 (patch) | |
tree | 51e87c809698563876cc6ee508462654c1868a56 /indra/llmessage | |
parent | 54c39177e58b9c189b96774d6ae3143d31559da0 (diff) | |
parent | ec5bd9c857b4d817685b09f9a10da7434ebbb816 (diff) |
YET another hairy merge from viewer-trunk. Conflicts resolved... so far.
Diffstat (limited to 'indra/llmessage')
-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"); |