diff options
author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
commit | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (patch) | |
tree | c395415163893b341dfbc3c54da77b8b924725af /indra/llmessage/message_prehash.h | |
parent | c32b0122ab915ce9bd0cfd8ec330495f2832d97d (diff) | |
parent | bc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (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; |