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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/llmessage/message_prehash.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp index 67ee5d5675..f11c1592e1 100644 --- a/indra/llmessage/message_prehash.cpp +++ b/indra/llmessage/message_prehash.cpp @@ -285,6 +285,7 @@ char * _PREHASH_LogFailedMoneyTransaction; char * _PREHASH_ViewerStartAuction; char * _PREHASH_StartAuction; char * _PREHASH_DuplicateFlags; +char * _PREHASH_RegionInfo2; char * _PREHASH_TextColor; char * _PREHASH_SlaveID; char * _PREHASH_Charter; @@ -650,9 +651,9 @@ char * _PREHASH_PreyAgent; char * _PREHASH_SimStats; char * _PREHASH_LogoutReply; char * _PREHASH_FeatureDisabled; +char * _PREHASH_PhysicalAvatarEventList; char * _PREHASH_ObjectLocalID; char * _PREHASH_Dropped; -char * _PREHASH_PhysicalAvatarEventList; char * _PREHASH_WebProfilesDisabled; char * _PREHASH_Destination; char * _PREHASH_MasterID; @@ -1617,6 +1618,7 @@ void init_prehash_data() _PREHASH_ViewerStartAuction = gMessageStringTable.getString("ViewerStartAuction"); _PREHASH_StartAuction = gMessageStringTable.getString("StartAuction"); _PREHASH_DuplicateFlags = gMessageStringTable.getString("DuplicateFlags"); + _PREHASH_RegionInfo2 = gMessageStringTable.getString("RegionInfo2"); _PREHASH_TextColor = gMessageStringTable.getString("TextColor"); _PREHASH_SlaveID = gMessageStringTable.getString("SlaveID"); _PREHASH_Charter = gMessageStringTable.getString("Charter"); @@ -1982,9 +1984,9 @@ void init_prehash_data() _PREHASH_SimStats = gMessageStringTable.getString("SimStats"); _PREHASH_LogoutReply = gMessageStringTable.getString("LogoutReply"); _PREHASH_FeatureDisabled = gMessageStringTable.getString("FeatureDisabled"); + _PREHASH_PhysicalAvatarEventList = gMessageStringTable.getString("PhysicalAvatarEventList"); _PREHASH_ObjectLocalID = gMessageStringTable.getString("ObjectLocalID"); _PREHASH_Dropped = gMessageStringTable.getString("Dropped"); - _PREHASH_PhysicalAvatarEventList = gMessageStringTable.getString("PhysicalAvatarEventList"); _PREHASH_WebProfilesDisabled = gMessageStringTable.getString("WebProfilesDisabled"); _PREHASH_Destination = gMessageStringTable.getString("Destination"); _PREHASH_MasterID = gMessageStringTable.getString("MasterID"); |