svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release

2 files changed, 6 insertions, 15 deletions

diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 9d7e603690..e153114d1d 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -534,8 +534,8 @@ char * _PREHASH_ReturnIDs;
 char * _PREHASH_Date;
 char * _PREHASH_AgentWearablesUpdate;
 char * _PREHASH_AgentDataUpdate;
-char * _PREHASH_Hash;
 char * _PREHASH_GroupDataUpdate;
+char * _PREHASH_Hash;
 char * _PREHASH_AgentGroupDataUpdate;
 char * _PREHASH_Left;
 char * _PREHASH_Mask;
@@ -663,7 +663,6 @@ char * _PREHASH_CreateNewOutfitAttachments;
 char * _PREHASH_RegionHandle;
 char * _PREHASH_TeleportProgress;
 char * _PREHASH_AgentQuitCopy;
-char * _PREHASH_ToViewer;
 char * _PREHASH_AvatarInterestsUpdate;
 char * _PREHASH_GroupNoticeID;
 char * _PREHASH_ParcelName;
@@ -722,6 +721,7 @@ char * _PREHASH_LogoutReply;
 char * _PREHASH_FeatureDisabled;
 char * _PREHASH_ObjectLocalID;
 char * _PREHASH_Dropped;
+char * _PREHASH_PhysicalAvatarEventList;
 char * _PREHASH_WebProfilesDisabled;
 char * _PREHASH_Destination;
 char * _PREHASH_MasterID;
@@ -995,7 +995,6 @@ char * _PREHASH_TrackAgentSession;
 char * _PREHASH_CacheMissType;
 char * _PREHASH_VFileID;
 char * _PREHASH_GroupInsigniaID;
-char * _PREHASH_FromID;
 char * _PREHASH_Online;
 char * _PREHASH_KickFlags;
 char * _PREHASH_CovenantID;
@@ -1179,7 +1178,6 @@ char * _PREHASH_EventData;
 char * _PREHASH_Final;
 char * _PREHASH_TelehubPos;
 char * _PREHASH_ReportAutosaveCrash;
-char * _PREHASH_Reset;
 char * _PREHASH_CreateTrustedCircuit;
 char * _PREHASH_DenyTrustedCircuit;
 char * _PREHASH_RequestTrustedCircuit;
@@ -1362,7 +1360,6 @@ char * _PREHASH_SimulatorPublicHostBlock;
 char * _PREHASH_HeaderData;
 char * _PREHASH_RequestMultipleObjects;
 char * _PREHASH_RetrieveInstantMessages;
-char * _PREHASH_DequeueInstantMessages;
 char * _PREHASH_OpenCircuit;
 char * _PREHASH_SecureSessionID;
 char * _PREHASH_CrossedRegion;
@@ -2000,8 +1997,8 @@ void init_prehash_data()
 	_PREHASH_Date = gMessageStringTable.getString("Date");
 	_PREHASH_AgentWearablesUpdate = gMessageStringTable.getString("AgentWearablesUpdate");
 	_PREHASH_AgentDataUpdate = gMessageStringTable.getString("AgentDataUpdate");
-	_PREHASH_Hash = gMessageStringTable.getString("Hash");
 	_PREHASH_GroupDataUpdate = gMessageStringTable.getString("GroupDataUpdate");
+	_PREHASH_Hash = gMessageStringTable.getString("Hash");
 	_PREHASH_AgentGroupDataUpdate = gMessageStringTable.getString("AgentGroupDataUpdate");
 	_PREHASH_Left = gMessageStringTable.getString("Left");
 	_PREHASH_Mask = gMessageStringTable.getString("Mask");
@@ -2129,7 +2126,6 @@ void init_prehash_data()
 	_PREHASH_RegionHandle = gMessageStringTable.getString("RegionHandle");
 	_PREHASH_TeleportProgress = gMessageStringTable.getString("TeleportProgress");
 	_PREHASH_AgentQuitCopy = gMessageStringTable.getString("AgentQuitCopy");
-	_PREHASH_ToViewer = gMessageStringTable.getString("ToViewer");
 	_PREHASH_AvatarInterestsUpdate = gMessageStringTable.getString("AvatarInterestsUpdate");
 	_PREHASH_GroupNoticeID = gMessageStringTable.getString("GroupNoticeID");
 	_PREHASH_ParcelName = gMessageStringTable.getString("ParcelName");
@@ -2188,6 +2184,7 @@ void init_prehash_data()
 	_PREHASH_FeatureDisabled = gMessageStringTable.getString("FeatureDisabled");
 	_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");
@@ -2461,7 +2458,6 @@ void init_prehash_data()
 	_PREHASH_CacheMissType = gMessageStringTable.getString("CacheMissType");
 	_PREHASH_VFileID = gMessageStringTable.getString("VFileID");
 	_PREHASH_GroupInsigniaID = gMessageStringTable.getString("GroupInsigniaID");
-	_PREHASH_FromID = gMessageStringTable.getString("FromID");
 	_PREHASH_Online = gMessageStringTable.getString("Online");
 	_PREHASH_KickFlags = gMessageStringTable.getString("KickFlags");
 	_PREHASH_CovenantID = gMessageStringTable.getString("CovenantID");
@@ -2645,7 +2641,6 @@ void init_prehash_data()
 	_PREHASH_Final = gMessageStringTable.getString("Final");
 	_PREHASH_TelehubPos = gMessageStringTable.getString("TelehubPos");
 	_PREHASH_ReportAutosaveCrash = gMessageStringTable.getString("ReportAutosaveCrash");
-	_PREHASH_Reset = gMessageStringTable.getString("Reset");
 	_PREHASH_CreateTrustedCircuit = gMessageStringTable.getString("CreateTrustedCircuit");
 	_PREHASH_DenyTrustedCircuit = gMessageStringTable.getString("DenyTrustedCircuit");
 	_PREHASH_RequestTrustedCircuit = gMessageStringTable.getString("RequestTrustedCircuit");
@@ -2828,7 +2823,6 @@ void init_prehash_data()
 	_PREHASH_HeaderData = gMessageStringTable.getString("HeaderData");
 	_PREHASH_RequestMultipleObjects = gMessageStringTable.getString("RequestMultipleObjects");
 	_PREHASH_RetrieveInstantMessages = gMessageStringTable.getString("RetrieveInstantMessages");
-	_PREHASH_DequeueInstantMessages = gMessageStringTable.getString("DequeueInstantMessages");
 	_PREHASH_OpenCircuit = gMessageStringTable.getString("OpenCircuit");
 	_PREHASH_SecureSessionID = gMessageStringTable.getString("SecureSessionID");
 	_PREHASH_CrossedRegion = gMessageStringTable.getString("CrossedRegion");
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h
index 19b9881dde..209b399ce8 100644
--- a/indra/llmessage/message_prehash.h
+++ b/indra/llmessage/message_prehash.h
@@ -534,8 +534,8 @@ extern char * _PREHASH_ReturnIDs;
 extern char * _PREHASH_Date;
 extern char * _PREHASH_AgentWearablesUpdate;
 extern char * _PREHASH_AgentDataUpdate;
-extern char * _PREHASH_Hash;
 extern char * _PREHASH_GroupDataUpdate;
+extern char * _PREHASH_Hash;
 extern char * _PREHASH_AgentGroupDataUpdate;
 extern char * _PREHASH_Left;
 extern char * _PREHASH_Mask;
@@ -663,7 +663,6 @@ extern char * _PREHASH_CreateNewOutfitAttachments;
 extern char * _PREHASH_RegionHandle;
 extern char * _PREHASH_TeleportProgress;
 extern char * _PREHASH_AgentQuitCopy;
-extern char * _PREHASH_ToViewer;
 extern char * _PREHASH_AvatarInterestsUpdate;
 extern char * _PREHASH_GroupNoticeID;
 extern char * _PREHASH_ParcelName;
@@ -722,6 +721,7 @@ extern char * _PREHASH_LogoutReply;
 extern char * _PREHASH_FeatureDisabled;
 extern char * _PREHASH_ObjectLocalID;
 extern char * _PREHASH_Dropped;
+extern char * _PREHASH_PhysicalAvatarEventList;
 extern char * _PREHASH_WebProfilesDisabled;
 extern char * _PREHASH_Destination;
 extern char * _PREHASH_MasterID;
@@ -995,7 +995,6 @@ extern char * _PREHASH_TrackAgentSession;
 extern char * _PREHASH_CacheMissType;
 extern char * _PREHASH_VFileID;
 extern char * _PREHASH_GroupInsigniaID;
-extern char * _PREHASH_FromID;
 extern char * _PREHASH_Online;
 extern char * _PREHASH_KickFlags;
 extern char * _PREHASH_CovenantID;
@@ -1179,7 +1178,6 @@ extern char * _PREHASH_EventData;
 extern char * _PREHASH_Final;
 extern char * _PREHASH_TelehubPos;
 extern char * _PREHASH_ReportAutosaveCrash;
-extern char * _PREHASH_Reset;
 extern char * _PREHASH_CreateTrustedCircuit;
 extern char * _PREHASH_DenyTrustedCircuit;
 extern char * _PREHASH_RequestTrustedCircuit;
@@ -1362,7 +1360,6 @@ extern char * _PREHASH_SimulatorPublicHostBlock;
 extern char * _PREHASH_HeaderData;
 extern char * _PREHASH_RequestMultipleObjects;
 extern char * _PREHASH_RetrieveInstantMessages;
-extern char * _PREHASH_DequeueInstantMessages;
 extern char * _PREHASH_OpenCircuit;
 extern char * _PREHASH_SecureSessionID;
 extern char * _PREHASH_CrossedRegion;