summaryrefslogtreecommitdiff
path: root/indra/llmessage/message_prehash.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2011-06-06 12:55:21 -0700
committerRoxie Linden <roxie@lindenlab.com>2011-06-06 12:55:21 -0700
commit73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (patch)
treec395415163893b341dfbc3c54da77b8b924725af /indra/llmessage/message_prehash.cpp
parentc32b0122ab915ce9bd0cfd8ec330495f2832d97d (diff)
parentbc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (diff)
automated merge
Diffstat (limited to 'indra/llmessage/message_prehash.cpp')
-rw-r--r--indra/llmessage/message_prehash.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 5d03615e53..6133f50637 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -742,6 +742,7 @@ char const* const _PREHASH_MoneyData = LLMessageStringTable::getInstance()->getS
char const* const _PREHASH_ObjectDeselect = LLMessageStringTable::getInstance()->getString("ObjectDeselect");
char const* const _PREHASH_NewAssetID = LLMessageStringTable::getInstance()->getString("NewAssetID");
char const* const _PREHASH_ObjectAdd = LLMessageStringTable::getInstance()->getString("ObjectAdd");
+char const* const _PREHASH_SimulatorFeatures = LLMessageStringTable::getInstance()->getString("SimulatorFeatures");
char const* const _PREHASH_RayEndIsIntersection = LLMessageStringTable::getInstance()->getString("RayEndIsIntersection");
char const* const _PREHASH_CompleteAuction = LLMessageStringTable::getInstance()->getString("CompleteAuction");
char const* const _PREHASH_CircuitCode = LLMessageStringTable::getInstance()->getString("CircuitCode");