diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/llmessage/message_prehash.h | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/llmessage/message_prehash.h')
| -rw-r--r-- | indra/llmessage/message_prehash.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h index 71661ef83d..3daf1c2701 100644 --- a/indra/llmessage/message_prehash.h +++ b/indra/llmessage/message_prehash.h @@ -285,6 +285,7 @@ extern char * _PREHASH_LogFailedMoneyTransaction; extern char * _PREHASH_ViewerStartAuction; extern char * _PREHASH_StartAuction; extern char * _PREHASH_DuplicateFlags; +extern char * _PREHASH_RegionInfo2; extern char * _PREHASH_TextColor; extern char * _PREHASH_SlaveID; extern char * _PREHASH_Charter; @@ -650,9 +651,9 @@ extern char * _PREHASH_PreyAgent; extern char * _PREHASH_SimStats; extern char * _PREHASH_LogoutReply; extern char * _PREHASH_FeatureDisabled; +extern char * _PREHASH_PhysicalAvatarEventList; extern char * _PREHASH_ObjectLocalID; extern char * _PREHASH_Dropped; -extern char * _PREHASH_PhysicalAvatarEventList; extern char * _PREHASH_WebProfilesDisabled; extern char * _PREHASH_Destination; extern char * _PREHASH_MasterID; |