svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release

1 files changed, 16 insertions, 28 deletions

diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index c2d7c9c2a3..9d7e603690 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -20,7 +20,6 @@ char * _PREHASH_X;
 char * _PREHASH_Y;
 char * _PREHASH_Z;
 char * _PREHASH_AddFlags;
-char * _PREHASH_ReservedNewbie;
 char * _PREHASH_FailureInfo;
 char * _PREHASH_MapData;
 char * _PREHASH_AddItem;
@@ -89,7 +88,6 @@ char * _PREHASH_RelatedRights;
 char * _PREHASH_RedirectGridX;
 char * _PREHASH_RedirectGridY;
 char * _PREHASH_TransferID;
-char * _PREHASH_Transacted;
 char * _PREHASH_TexturesChanged;
 char * _PREHASH_UserLookAt;
 char * _PREHASH_TestBlock1;
@@ -116,7 +114,6 @@ char * _PREHASH_SetSimStatusInDatabase;
 char * _PREHASH_SetSimPresenceInDatabase;
 char * _PREHASH_CameraProperty;
 char * _PREHASH_BrushSize;
-char * _PREHASH_StartExpungeProcess;
 char * _PREHASH_SimulatorSetMap;
 char * _PREHASH_RegionPresenceRequestByRegionID;
 char * _PREHASH_ParcelObjectOwnersReply;
@@ -210,8 +207,8 @@ char * _PREHASH_SimName;
 char * _PREHASH_UserReport;
 char * _PREHASH_DownloadPriority;
 char * _PREHASH_ToAgentId;
-char * _PREHASH_Mag;
 char * _PREHASH_DirPopularQuery;
+char * _PREHASH_Mag;
 char * _PREHASH_ParcelPropertiesRequestByID;
 char * _PREHASH_ObjectLink;
 char * _PREHASH_RpcScriptReplyInbound;
@@ -420,7 +417,6 @@ char * _PREHASH_TerminateFriendship;
 char * _PREHASH_TaskData;
 char * _PREHASH_SimWideMaxPrims;
 char * _PREHASH_TotalPrims;
-char * _PREHASH_SourceFilename;
 char * _PREHASH_ProfileBegin;
 char * _PREHASH_MoneyDetailsRequest;
 char * _PREHASH_Request;
@@ -467,7 +463,6 @@ char * _PREHASH_ParamInUse;
 char * _PREHASH_GodKickUser;
 char * _PREHASH_PickName;
 char * _PREHASH_TaskName;
-char * _PREHASH_ParcelGodReserveForNewbie;
 char * _PREHASH_SubType;
 char * _PREHASH_ObjectCount;
 char * _PREHASH_RegionPresenceRequestByHandle;
@@ -486,10 +481,13 @@ char * _PREHASH_UpdateParcel;
 char * _PREHASH_ClearAgentSessions;
 char * _PREHASH_SetAlwaysRun;
 char * _PREHASH_NVPair;
+char * _PREHASH_SearchType;
 char * _PREHASH_ObjectSpinStart;
 char * _PREHASH_UseEstateSun;
 char * _PREHASH_LogoutBlock;
+char * _PREHASH_RelayLogControl;
 char * _PREHASH_RegionID;
+char * _PREHASH_AbuseRegionID;
 char * _PREHASH_Creator;
 char * _PREHASH_ProposalText;
 char * _PREHASH_DirEventsReply;
@@ -534,7 +532,6 @@ char * _PREHASH_MaxY;
 char * _PREHASH_TextureAnim;
 char * _PREHASH_ReturnIDs;
 char * _PREHASH_Date;
-char * _PREHASH_GestureUpdate;
 char * _PREHASH_AgentWearablesUpdate;
 char * _PREHASH_AgentDataUpdate;
 char * _PREHASH_Hash;
@@ -556,7 +553,6 @@ char * _PREHASH_HistoryItemData;
 char * _PREHASH_AgentCachedTexture;
 char * _PREHASH_Subject;
 char * _PREHASH_East;
-char * _PREHASH_GodExpungeUser;
 char * _PREHASH_QueryReplies;
 char * _PREHASH_ObjectCategory;
 char * _PREHASH_Time;
@@ -783,6 +779,7 @@ char * _PREHASH_UnsubscribeLoad;
 char * _PREHASH_Packet;
 char * _PREHASH_UndoLand;
 char * _PREHASH_SimAccess;
+char * _PREHASH_AbuserID;
 char * _PREHASH_MembershipFee;
 char * _PREHASH_InviteGroupResponse;
 char * _PREHASH_CreateInventoryFolder;
@@ -920,6 +917,7 @@ char * _PREHASH_ImageNotInDatabase;
 char * _PREHASH_StartDate;
 char * _PREHASH_AnimID;
 char * _PREHASH_Serial;
+char * _PREHASH_AbuseRegionName;
 char * _PREHASH_ControlPort;
 char * _PREHASH_ModifyLand;
 char * _PREHASH_Digest;
@@ -984,11 +982,11 @@ char * _PREHASH_EventFlags;
 char * _PREHASH_TallyVotes;
 char * _PREHASH_Result;
 char * _PREHASH_LookAt;
+char * _PREHASH_SearchOrder;
 char * _PREHASH_PayButton;
 char * _PREHASH_SelfCount;
 char * _PREHASH_PacketCount;
 char * _PREHASH_ParcelBuyPass;
-char * _PREHASH_Identified;
 char * _PREHASH_OldItemID;
 char * _PREHASH_RegionPort;
 char * _PREHASH_PriceEnergyUnit;
@@ -1024,7 +1022,6 @@ char * _PREHASH_EconomyDataRequest;
 char * _PREHASH_TeleportLureRequest;
 char * _PREHASH_FolderID;
 char * _PREHASH_RegionHandleRequest;
-char * _PREHASH_GestureRequest;
 char * _PREHASH_ScriptDataRequest;
 char * _PREHASH_GroupRoleDataRequest;
 char * _PREHASH_GroupTitlesRequest;
@@ -1168,11 +1165,9 @@ char * _PREHASH_Ratio;
 char * _PREHASH_JoinGroupReply;
 char * _PREHASH_LiveHelpGroupReply;
 char * _PREHASH_Score;
-char * _PREHASH_ExpungeData;
 char * _PREHASH_Image;
 char * _PREHASH_ObjectClickAction;
 char * _PREHASH_Delta;
-char * _PREHASH_InitiateUpload;
 char * _PREHASH_Parameter;
 char * _PREHASH_Flags;
 char * _PREHASH_Plane;
@@ -1208,7 +1203,6 @@ char * _PREHASH_Disconnect;
 char * _PREHASH_SimPosition;
 char * _PREHASH_SimWideTotalPrims;
 char * _PREHASH_Index;
-char * _PREHASH_BaseFilename;
 char * _PREHASH_SimFilename;
 char * _PREHASH_LastOwnerID;
 char * _PREHASH_GroupNoticeRequest;
@@ -1293,6 +1287,7 @@ char * _PREHASH_AssetBlock;
 char * _PREHASH_AcceptNotices;
 char * _PREHASH_SetGroupAcceptNotices;
 char * _PREHASH_CloseCircuit;
+char * _PREHASH_LogControl;
 char * _PREHASH_TeleportFinish;
 char * _PREHASH_PathRevolutions;
 char * _PREHASH_ClassifiedInfoReply;
@@ -1472,7 +1467,6 @@ char * _PREHASH_DirLandReply;
 char * _PREHASH_SpaceLocationTeleportReply;
 char * _PREHASH_MuteType;
 char * _PREHASH_IMViaEMail;
-char * _PREHASH_StartExpungeProcessAck;
 char * _PREHASH_RentPrice;
 char * _PREHASH_GenericMessage;
 char * _PREHASH_ChildAgentAlive;
@@ -1492,7 +1486,6 @@ void init_prehash_data()
 	_PREHASH_Y = gMessageStringTable.getString("Y");
 	_PREHASH_Z = gMessageStringTable.getString("Z");
 	_PREHASH_AddFlags = gMessageStringTable.getString("AddFlags");
-	_PREHASH_ReservedNewbie = gMessageStringTable.getString("ReservedNewbie");
 	_PREHASH_FailureInfo = gMessageStringTable.getString("FailureInfo");
 	_PREHASH_MapData = gMessageStringTable.getString("MapData");
 	_PREHASH_AddItem = gMessageStringTable.getString("AddItem");
@@ -1561,7 +1554,6 @@ void init_prehash_data()
 	_PREHASH_RedirectGridX = gMessageStringTable.getString("RedirectGridX");
 	_PREHASH_RedirectGridY = gMessageStringTable.getString("RedirectGridY");
 	_PREHASH_TransferID = gMessageStringTable.getString("TransferID");
-	_PREHASH_Transacted = gMessageStringTable.getString("Transacted");
 	_PREHASH_TexturesChanged = gMessageStringTable.getString("TexturesChanged");
 	_PREHASH_UserLookAt = gMessageStringTable.getString("UserLookAt");
 	_PREHASH_TestBlock1 = gMessageStringTable.getString("TestBlock1");
@@ -1588,7 +1580,6 @@ void init_prehash_data()
 	_PREHASH_SetSimPresenceInDatabase = gMessageStringTable.getString("SetSimPresenceInDatabase");
 	_PREHASH_CameraProperty = gMessageStringTable.getString("CameraProperty");
 	_PREHASH_BrushSize = gMessageStringTable.getString("BrushSize");
-	_PREHASH_StartExpungeProcess = gMessageStringTable.getString("StartExpungeProcess");
 	_PREHASH_SimulatorSetMap = gMessageStringTable.getString("SimulatorSetMap");
 	_PREHASH_RegionPresenceRequestByRegionID = gMessageStringTable.getString("RegionPresenceRequestByRegionID");
 	_PREHASH_ParcelObjectOwnersReply = gMessageStringTable.getString("ParcelObjectOwnersReply");
@@ -1682,8 +1673,8 @@ void init_prehash_data()
 	_PREHASH_UserReport = gMessageStringTable.getString("UserReport");
 	_PREHASH_DownloadPriority = gMessageStringTable.getString("DownloadPriority");
 	_PREHASH_ToAgentId = gMessageStringTable.getString("ToAgentId");
-	_PREHASH_Mag = gMessageStringTable.getString("Mag");
 	_PREHASH_DirPopularQuery = gMessageStringTable.getString("DirPopularQuery");
+	_PREHASH_Mag = gMessageStringTable.getString("Mag");
 	_PREHASH_ParcelPropertiesRequestByID = gMessageStringTable.getString("ParcelPropertiesRequestByID");
 	_PREHASH_ObjectLink = gMessageStringTable.getString("ObjectLink");
 	_PREHASH_RpcScriptReplyInbound = gMessageStringTable.getString("RpcScriptReplyInbound");
@@ -1892,7 +1883,6 @@ void init_prehash_data()
 	_PREHASH_TaskData = gMessageStringTable.getString("TaskData");
 	_PREHASH_SimWideMaxPrims = gMessageStringTable.getString("SimWideMaxPrims");
 	_PREHASH_TotalPrims = gMessageStringTable.getString("TotalPrims");
-	_PREHASH_SourceFilename = gMessageStringTable.getString("SourceFilename");
 	_PREHASH_ProfileBegin = gMessageStringTable.getString("ProfileBegin");
 	_PREHASH_MoneyDetailsRequest = gMessageStringTable.getString("MoneyDetailsRequest");
 	_PREHASH_Request = gMessageStringTable.getString("Request");
@@ -1939,7 +1929,6 @@ void init_prehash_data()
 	_PREHASH_GodKickUser = gMessageStringTable.getString("GodKickUser");
 	_PREHASH_PickName = gMessageStringTable.getString("PickName");
 	_PREHASH_TaskName = gMessageStringTable.getString("TaskName");
-	_PREHASH_ParcelGodReserveForNewbie = gMessageStringTable.getString("ParcelGodReserveForNewbie");
 	_PREHASH_SubType = gMessageStringTable.getString("SubType");
 	_PREHASH_ObjectCount = gMessageStringTable.getString("ObjectCount");
 	_PREHASH_RegionPresenceRequestByHandle = gMessageStringTable.getString("RegionPresenceRequestByHandle");
@@ -1958,10 +1947,13 @@ void init_prehash_data()
 	_PREHASH_ClearAgentSessions = gMessageStringTable.getString("ClearAgentSessions");
 	_PREHASH_SetAlwaysRun = gMessageStringTable.getString("SetAlwaysRun");
 	_PREHASH_NVPair = gMessageStringTable.getString("NVPair");
+	_PREHASH_SearchType = gMessageStringTable.getString("SearchType");
 	_PREHASH_ObjectSpinStart = gMessageStringTable.getString("ObjectSpinStart");
 	_PREHASH_UseEstateSun = gMessageStringTable.getString("UseEstateSun");
 	_PREHASH_LogoutBlock = gMessageStringTable.getString("LogoutBlock");
+	_PREHASH_RelayLogControl = gMessageStringTable.getString("RelayLogControl");
 	_PREHASH_RegionID = gMessageStringTable.getString("RegionID");
+	_PREHASH_AbuseRegionID = gMessageStringTable.getString("AbuseRegionID");
 	_PREHASH_Creator = gMessageStringTable.getString("Creator");
 	_PREHASH_ProposalText = gMessageStringTable.getString("ProposalText");
 	_PREHASH_DirEventsReply = gMessageStringTable.getString("DirEventsReply");
@@ -2006,7 +1998,6 @@ void init_prehash_data()
 	_PREHASH_TextureAnim = gMessageStringTable.getString("TextureAnim");
 	_PREHASH_ReturnIDs = gMessageStringTable.getString("ReturnIDs");
 	_PREHASH_Date = gMessageStringTable.getString("Date");
-	_PREHASH_GestureUpdate = gMessageStringTable.getString("GestureUpdate");
 	_PREHASH_AgentWearablesUpdate = gMessageStringTable.getString("AgentWearablesUpdate");
 	_PREHASH_AgentDataUpdate = gMessageStringTable.getString("AgentDataUpdate");
 	_PREHASH_Hash = gMessageStringTable.getString("Hash");
@@ -2028,7 +2019,6 @@ void init_prehash_data()
 	_PREHASH_AgentCachedTexture = gMessageStringTable.getString("AgentCachedTexture");
 	_PREHASH_Subject = gMessageStringTable.getString("Subject");
 	_PREHASH_East = gMessageStringTable.getString("East");
-	_PREHASH_GodExpungeUser = gMessageStringTable.getString("GodExpungeUser");
 	_PREHASH_QueryReplies = gMessageStringTable.getString("QueryReplies");
 	_PREHASH_ObjectCategory = gMessageStringTable.getString("ObjectCategory");
 	_PREHASH_Time = gMessageStringTable.getString("Time");
@@ -2255,6 +2245,7 @@ void init_prehash_data()
 	_PREHASH_Packet = gMessageStringTable.getString("Packet");
 	_PREHASH_UndoLand = gMessageStringTable.getString("UndoLand");
 	_PREHASH_SimAccess = gMessageStringTable.getString("SimAccess");
+	_PREHASH_AbuserID = gMessageStringTable.getString("AbuserID");
 	_PREHASH_MembershipFee = gMessageStringTable.getString("MembershipFee");
 	_PREHASH_InviteGroupResponse = gMessageStringTable.getString("InviteGroupResponse");
 	_PREHASH_CreateInventoryFolder = gMessageStringTable.getString("CreateInventoryFolder");
@@ -2392,6 +2383,7 @@ void init_prehash_data()
 	_PREHASH_StartDate = gMessageStringTable.getString("StartDate");
 	_PREHASH_AnimID = gMessageStringTable.getString("AnimID");
 	_PREHASH_Serial = gMessageStringTable.getString("Serial");
+	_PREHASH_AbuseRegionName = gMessageStringTable.getString("AbuseRegionName");
 	_PREHASH_ControlPort = gMessageStringTable.getString("ControlPort");
 	_PREHASH_ModifyLand = gMessageStringTable.getString("ModifyLand");
 	_PREHASH_Digest = gMessageStringTable.getString("Digest");
@@ -2456,11 +2448,11 @@ void init_prehash_data()
 	_PREHASH_TallyVotes = gMessageStringTable.getString("TallyVotes");
 	_PREHASH_Result = gMessageStringTable.getString("Result");
 	_PREHASH_LookAt = gMessageStringTable.getString("LookAt");
+	_PREHASH_SearchOrder = gMessageStringTable.getString("SearchOrder");
 	_PREHASH_PayButton = gMessageStringTable.getString("PayButton");
 	_PREHASH_SelfCount = gMessageStringTable.getString("SelfCount");
 	_PREHASH_PacketCount = gMessageStringTable.getString("PacketCount");
 	_PREHASH_ParcelBuyPass = gMessageStringTable.getString("ParcelBuyPass");
-	_PREHASH_Identified = gMessageStringTable.getString("Identified");
 	_PREHASH_OldItemID = gMessageStringTable.getString("OldItemID");
 	_PREHASH_RegionPort = gMessageStringTable.getString("RegionPort");
 	_PREHASH_PriceEnergyUnit = gMessageStringTable.getString("PriceEnergyUnit");
@@ -2496,7 +2488,6 @@ void init_prehash_data()
 	_PREHASH_TeleportLureRequest = gMessageStringTable.getString("TeleportLureRequest");
 	_PREHASH_FolderID = gMessageStringTable.getString("FolderID");
 	_PREHASH_RegionHandleRequest = gMessageStringTable.getString("RegionHandleRequest");
-	_PREHASH_GestureRequest = gMessageStringTable.getString("GestureRequest");
 	_PREHASH_ScriptDataRequest = gMessageStringTable.getString("ScriptDataRequest");
 	_PREHASH_GroupRoleDataRequest = gMessageStringTable.getString("GroupRoleDataRequest");
 	_PREHASH_GroupTitlesRequest = gMessageStringTable.getString("GroupTitlesRequest");
@@ -2640,11 +2631,9 @@ void init_prehash_data()
 	_PREHASH_JoinGroupReply = gMessageStringTable.getString("JoinGroupReply");
 	_PREHASH_LiveHelpGroupReply = gMessageStringTable.getString("LiveHelpGroupReply");
 	_PREHASH_Score = gMessageStringTable.getString("Score");
-	_PREHASH_ExpungeData = gMessageStringTable.getString("ExpungeData");
 	_PREHASH_Image = gMessageStringTable.getString("Image");
 	_PREHASH_ObjectClickAction = gMessageStringTable.getString("ObjectClickAction");
 	_PREHASH_Delta = gMessageStringTable.getString("Delta");
-	_PREHASH_InitiateUpload = gMessageStringTable.getString("InitiateUpload");
 	_PREHASH_Parameter = gMessageStringTable.getString("Parameter");
 	_PREHASH_Flags = gMessageStringTable.getString("Flags");
 	_PREHASH_Plane = gMessageStringTable.getString("Plane");
@@ -2680,7 +2669,6 @@ void init_prehash_data()
 	_PREHASH_SimPosition = gMessageStringTable.getString("SimPosition");
 	_PREHASH_SimWideTotalPrims = gMessageStringTable.getString("SimWideTotalPrims");
 	_PREHASH_Index = gMessageStringTable.getString("Index");
-	_PREHASH_BaseFilename = gMessageStringTable.getString("BaseFilename");
 	_PREHASH_SimFilename = gMessageStringTable.getString("SimFilename");
 	_PREHASH_LastOwnerID = gMessageStringTable.getString("LastOwnerID");
 	_PREHASH_GroupNoticeRequest = gMessageStringTable.getString("GroupNoticeRequest");
@@ -2765,6 +2753,7 @@ void init_prehash_data()
 	_PREHASH_AcceptNotices = gMessageStringTable.getString("AcceptNotices");
 	_PREHASH_SetGroupAcceptNotices = gMessageStringTable.getString("SetGroupAcceptNotices");
 	_PREHASH_CloseCircuit = gMessageStringTable.getString("CloseCircuit");
+	_PREHASH_LogControl = gMessageStringTable.getString("LogControl");
 	_PREHASH_TeleportFinish = gMessageStringTable.getString("TeleportFinish");
 	_PREHASH_PathRevolutions = gMessageStringTable.getString("PathRevolutions");
 	_PREHASH_ClassifiedInfoReply = gMessageStringTable.getString("ClassifiedInfoReply");
@@ -2944,7 +2933,6 @@ void init_prehash_data()
 	_PREHASH_SpaceLocationTeleportReply = gMessageStringTable.getString("SpaceLocationTeleportReply");
 	_PREHASH_MuteType = gMessageStringTable.getString("MuteType");
 	_PREHASH_IMViaEMail = gMessageStringTable.getString("IMViaEMail");
-	_PREHASH_StartExpungeProcessAck = gMessageStringTable.getString("StartExpungeProcessAck");
 	_PREHASH_RentPrice = gMessageStringTable.getString("RentPrice");
 	_PREHASH_GenericMessage = gMessageStringTable.getString("GenericMessage");
 	_PREHASH_ChildAgentAlive = gMessageStringTable.getString("ChildAgentAlive");