diff options
author | Roxie Linden <roxie@lindenlab.com> | 2011-06-03 14:34:00 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-03 14:34:00 -0700 |
commit | bc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (patch) | |
tree | 9ad50a74079b8f571c8f873ae2de1eec16474e5b /indra/llmessage/message_prehash.h | |
parent | f4722b39059147088b9008736370b407daec5d91 (diff) | |
parent | 31e850d04885bed2ac779c66bb6b7923a0a51d96 (diff) |
automated merge
Diffstat (limited to 'indra/llmessage/message_prehash.h')
-rw-r--r-- | indra/llmessage/message_prehash.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h index 8dc86601e6..f94ee1ed22 100644 --- a/indra/llmessage/message_prehash.h +++ b/indra/llmessage/message_prehash.h @@ -742,6 +742,7 @@ extern char const* const _PREHASH_MoneyData; extern char const* const _PREHASH_ObjectDeselect; extern char const* const _PREHASH_NewAssetID; extern char const* const _PREHASH_ObjectAdd; +extern char const* const _PREHASH_SimulatorFeatures; extern char const* const _PREHASH_RayEndIsIntersection; extern char const* const _PREHASH_CompleteAuction; extern char const* const _PREHASH_CircuitCode; |