From a0ed214a6eeb7c4f33722cf15f604ada294078ac Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 7 Jan 2022 04:15:58 +0000 Subject: [PATCH] save a few NS (hope not 2 much) --- .../ClientStack/Linden/UDP/LLClientView.cs | 743 +++++++++--------- 1 file changed, 371 insertions(+), 372 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b8bd7e6e5d..24f1f5dbe9 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -27,7 +27,6 @@ using System; using System.Collections.Generic; -using System.Collections.Concurrent; using System.Net; using System.Reflection; using System.Runtime; @@ -37,7 +36,6 @@ using System.Threading; using log4net; using OpenMetaverse; using OpenMetaverse.Packets; -using OpenMetaverse.Messages.Linden; using OpenMetaverse.StructuredData; using OpenSim.Framework; @@ -617,7 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_udpServer.Flush(m_udpClient); // Remove ourselves from the scene - m_scene.RemoveClient(AgentId, true); + m_scene.RemoveClient(m_agentId, true); SceneAgent = null; // We can't reach into other scenes and close the connection @@ -654,7 +652,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (!SceneAgent.IsChildAgent) { KickUserPacket kupack = (KickUserPacket)PacketPool.Instance.GetPacket(PacketType.KickUser); - kupack.UserInfo.AgentID = AgentId; + kupack.UserInfo.AgentID = m_agentId; kupack.UserInfo.SessionID = SessionId; kupack.TargetBlock.TargetIP = 0; kupack.TargetBlock.TargetPort = 0; @@ -883,7 +881,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP RegionSettings regionSettings = regionInfo.RegionSettings; EstateSettings es = regionInfo.EstateSettings; - bool isEstateManager = m_scene.Permissions.IsEstateManager(AgentId); // go by oficial path + bool isEstateManager = m_scene.Permissions.IsEstateManager(m_agentId); // go by oficial path uint regionFlags = GetRegionFlags(); UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); @@ -996,8 +994,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP Buffer.BlockCopy(AgentMovementCompleteHeader, 0, data, 0, 10); //AgentData block - AgentId.ToBytes(data, 10); // 26 - SessionId.ToBytes(data, 26); // 42 + m_agentId.ToBytes(data, 10); // 26 + m_sessionId.ToBytes(data, 26); // 42 //Data block if ((pos.X == 0) && (pos.Y == 0) && (pos.Z == 0)) @@ -1335,7 +1333,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); - GAPIRP.AgentData.AgentID = AgentId; + GAPIRP.AgentData.AgentID = m_agentId; GAPIRP.AgentData.GroupID = groupID; GAPIRP.TransactionData.TransactionID = transactionID; GAPIRP.TransactionData.TotalNumItems = ((uint)i+1); @@ -1359,7 +1357,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket(); - GAPIRP.AgentData.AgentID = AgentId; + GAPIRP.AgentData.AgentID = m_agentId; GAPIRP.AgentData.GroupID = groupID; GAPIRP.TransactionData.TransactionID = transactionID; GAPIRP.TransactionData.TotalNumItems = 1; @@ -1387,7 +1385,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); - GVHIRP.AgentData.AgentID = AgentId; + GVHIRP.AgentData.AgentID = m_agentId; GVHIRP.AgentData.GroupID = groupID; GVHIRP.TransactionData.TransactionID = transactionID; GVHIRP.TransactionData.TotalNumItems = ((uint)i+1); @@ -1414,7 +1412,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket(); - GVHIRP.AgentData.AgentID = AgentId; + GVHIRP.AgentData.AgentID = m_agentId; GVHIRP.AgentData.GroupID = groupID; GVHIRP.TransactionData.TransactionID = transactionID; GVHIRP.TransactionData.TotalNumItems = 0; @@ -1858,7 +1856,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public AgentCircuitData RequestClientInfo() { AgentCircuitData agentData = new AgentCircuitData(); - agentData.AgentID = AgentId; + agentData.AgentID = m_agentId; agentData.SessionID = m_sessionId; agentData.SecureSessionID = SecureSessionId; agentData.circuitcode = m_circuitCode; @@ -1886,7 +1884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP CrossedRegionPacket newSimPack = new CrossedRegionPacket(); // TODO: don't create new blocks if recycling an old packet newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock(); - newSimPack.AgentData.AgentID = AgentId; + newSimPack.AgentData.AgentID = m_agentId; newSimPack.AgentData.SessionID = m_sessionId; newSimPack.Info = new CrossedRegionPacket.InfoBlock(); newSimPack.Info.Position = pos; @@ -1919,7 +1917,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //setup header and agentinfo block Buffer.BlockCopy(MapBlockItemHeader, 0, data, 0, 10); - AgentId.ToBytes(data, 10); // 26 + m_agentId.ToBytes(data, 10); // 26 Utils.UIntToBytesSafepos(flags, data, 26); // 30 //RequestData block @@ -2023,7 +2021,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //setup header and agentinfo block Buffer.BlockCopy(MapBlockReplyHeader, 0, data, 0, 10); - AgentId.ToBytes(data, 10); // 26 + m_agentId.ToBytes(data, 10); // 26 Utils.UIntToBytesSafepos(flags, data, 26); // 30 int countpos = 30; @@ -2120,7 +2118,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags) { TeleportLocalPacket tpLocal = (TeleportLocalPacket)PacketPool.Instance.GetPacket(PacketType.TeleportLocal); - tpLocal.Info.AgentID = AgentId; + tpLocal.Info.AgentID = m_agentId; tpLocal.Info.TeleportFlags = flags; tpLocal.Info.LocationID = 2; tpLocal.Info.LookAt = lookAt; @@ -2136,7 +2134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish); TeleportFinishPacket teleport = new TeleportFinishPacket(); - teleport.Info.AgentID = AgentId; + teleport.Info.AgentID = m_agentId; teleport.Info.RegionHandle = regionHandle; teleport.Info.SimAccess = simAccess; @@ -2164,7 +2162,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendTeleportFailed(string reason) { TeleportFailedPacket tpFailed = (TeleportFailedPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFailed); - tpFailed.Info.AgentID = AgentId; + tpFailed.Info.AgentID = m_agentId; tpFailed.Info.Reason = Util.StringToBytes256(reason); tpFailed.AlertInfo = new TeleportFailedPacket.AlertInfoBlock[0]; @@ -2188,7 +2186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendTeleportProgress(uint flags, string message) { TeleportProgressPacket tpProgress = (TeleportProgressPacket)PacketPool.Instance.GetPacket(PacketType.TeleportProgress); - tpProgress.AgentData.AgentID = this.AgentId; + tpProgress.AgentData.AgentID = m_agentId; tpProgress.Info.TeleportFlags = flags; tpProgress.Info.Message = Util.StringToBytes256(message); @@ -2199,7 +2197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item) { MoneyBalanceReplyPacket money = (MoneyBalanceReplyPacket)PacketPool.Instance.GetPacket(PacketType.MoneyBalanceReply); - money.MoneyData.AgentID = AgentId; + money.MoneyData.AgentID = m_agentId; money.MoneyData.TransactionID = transaction; money.MoneyData.TransactionSuccess = success; money.MoneyData.Description = description; @@ -2457,7 +2455,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { InventoryDescendentsPacket descend = (InventoryDescendentsPacket)PacketPool.Instance.GetPacket(PacketType.InventoryDescendents); descend.Header.Zerocoded = true; - descend.AgentData.AgentID = AgentId; + descend.AgentData.AgentID = m_agentId; descend.AgentData.OwnerID = ownerID; descend.AgentData.FolderID = folderID; descend.AgentData.Version = version; @@ -2482,7 +2480,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP const uint FULL_MASK_PERMISSIONS = (uint)0x7fffffff; FetchInventoryReplyPacket inventoryReply = (FetchInventoryReplyPacket)PacketPool.Instance.GetPacket(PacketType.FetchInventoryReply); - inventoryReply.AgentData.AgentID = AgentId; + inventoryReply.AgentData.AgentID = m_agentId; int total = items.Length; int count = 0; @@ -2564,7 +2562,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP = (BulkUpdateInventoryPacket)PacketPool.Instance.GetPacket(PacketType.BulkUpdateInventory); bulkUpdate.Header.Zerocoded = true; - bulkUpdate.AgentData.AgentID = AgentId; + bulkUpdate.AgentData.AgentID = m_agentId; bulkUpdate.AgentData.TransactionID = transactionId; bulkUpdate.FolderData = folderDataBlocks.ToArray(); List foo = new List(); @@ -2593,7 +2591,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // If there are any items then we have to start sending them off in this packet - the next folder will have // to be in its own bulk update packet. Also, we can only fit 5 items in a packet (at least this was the limit // being used on the Linden grid at 20081203). - InventoryCollection contents = invService.GetFolderContent(AgentId, folder.ID); // folder.RequestListOfItems(); + InventoryCollection contents = invService.GetFolderContent(m_agentId, folder.ID); // folder.RequestListOfItems(); List items = contents.Items; while (items.Count > 0) { @@ -2601,7 +2599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP = (BulkUpdateInventoryPacket)PacketPool.Instance.GetPacket(PacketType.BulkUpdateInventory); bulkUpdate.Header.Zerocoded = true; - bulkUpdate.AgentData.AgentID = AgentId; + bulkUpdate.AgentData.AgentID = m_agentId; bulkUpdate.AgentData.TransactionID = transactionId; bulkUpdate.FolderData = folderDataBlocks.ToArray(); @@ -2714,7 +2712,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (eq == null) return; - eq.SendBulkUpdateInventoryItem(item, AgentId, transationID); + eq.SendBulkUpdateInventoryItem(item, m_agentId, transationID); /* const uint FULL_MASK_PERMISSIONS = (uint)0x7ffffff; @@ -2722,7 +2720,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP BulkUpdateInventoryPacket bulkUpdate = (BulkUpdateInventoryPacket)PacketPool.Instance.GetPacket(PacketType.BulkUpdateInventory); - bulkUpdate.AgentData.AgentID = AgentId; + bulkUpdate.AgentData.AgentID = m_agentId; bulkUpdate.AgentData.TransactionID = transationID ?? UUID.Random(); bulkUpdate.FolderData = new BulkUpdateInventoryPacket.FolderDataBlock[1]; @@ -2785,7 +2783,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.UpdateCreateInventoryItem); // TODO: don't create new blocks if recycling an old packet - InventoryReply.AgentData.AgentID = AgentId; + InventoryReply.AgentData.AgentID = m_agentId; InventoryReply.AgentData.SimApproved = true; InventoryReply.AgentData.TransactionID = transactionID; InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; @@ -2829,7 +2827,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { RemoveInventoryItemPacket remove = (RemoveInventoryItemPacket)PacketPool.Instance.GetPacket(PacketType.RemoveInventoryItem); // TODO: don't create new blocks if recycling an old packet - remove.AgentData.AgentID = AgentId; + remove.AgentData.AgentID = m_agentId; remove.AgentData.SessionID = m_sessionId; remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1]; remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock(); @@ -3002,7 +3000,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //setup header Buffer.BlockCopy(AvatarPickerReplyHeader, 0, data, 0, 10); - AgentId.ToBytes(data, 10); //26 + m_agentId.ToBytes(data, 10); //26 QueryID.ToBytes(data, 26); //42 if (users.Count == 0) @@ -3063,7 +3061,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) { - if (agentid == AgentId) + if (agentid == m_agentId) { ActiveGroupId = activegroupid; ActiveGroupName = groupname; @@ -3090,7 +3088,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); //alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; //alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); - //alertPack.AgentInfo[0].AgentID = AgentId; + //alertPack.AgentInfo[0].AgentID = m_agentId; alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); alertPack.AlertData.Message = Util.StringToBytes256(message); alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[0]; @@ -3102,7 +3100,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AlertMessagePacket alertPack = (AlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AlertMessage); //alertPack.AgentInfo = new AlertMessagePacket.AgentInfoBlock[1]; //alertPack.AgentInfo[0] = new AlertMessagePacket.AgentInfoBlock(); - //alertPack.AgentInfo[0].AgentID = AgentId; + //alertPack.AgentInfo[0].AgentID = m_agentId; alertPack.AlertData = new AlertMessagePacket.AlertDataBlock(); alertPack.AlertData.Message = Util.StringToBytes256(message); alertPack.AlertInfo = new AlertMessagePacket.AlertInfoBlock[1]; @@ -3127,7 +3125,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (!modal && !message.StartsWith("ALERT: ") && !message.StartsWith("NOTIFY: ") && message != "Home position set." && message != "You died and have been teleported to your home location") message = "/" + message; AgentAlertMessagePacket alertPack = (AgentAlertMessagePacket)PacketPool.Instance.GetPacket(PacketType.AgentAlertMessage); - alertPack.AgentData.AgentID = AgentId; + alertPack.AgentData.AgentID = m_agentId; alertPack.AlertData.Message = Util.StringToBytes256(message); alertPack.AlertData.Modal = modal; OutPacket(alertPack, ThrottleOutPacketType.Task); @@ -3254,7 +3252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { ViewerEffectPacket packet = (ViewerEffectPacket)PacketPool.Instance.GetPacket(PacketType.ViewerEffect); -// packet.AgentData.AgentID = AgentId; +// packet.AgentData.AgentID = m_agentId; // packet.AgentData.SessionID = SessionId; packet.Effect = effectBlocks; @@ -3268,7 +3266,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP UUID partnerID) { AvatarPropertiesReplyPacket avatarReply = (AvatarPropertiesReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPropertiesReply); - avatarReply.AgentData.AgentID = AgentId; + avatarReply.AgentData.AgentID = m_agentId; avatarReply.AgentData.AvatarID = avatarID; if (aboutText != null) avatarReply.PropertiesData.AboutText = Util.StringToBytes1024(aboutText); @@ -3298,9 +3296,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message) { if (!SceneAgent.IsChildAgent) - SendInstantMessage(new GridInstantMessage(null, FromAvatarID, FromAvatarName, AgentId, 1, Message, false, new Vector3())); + SendInstantMessage(new GridInstantMessage(null, FromAvatarID, FromAvatarName, m_agentId, 1, Message, false, new Vector3())); - //SendInstantMessage(FromAvatarID, fromSessionID, Message, AgentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch()); + //SendInstantMessage(FromAvatarID, fromSessionID, Message, m_agentId, SessionId, FromAvatarName, (byte)21,(uint) Util.UnixTimeSinceEpoch()); } public void SendLogoutPacket() @@ -3314,8 +3312,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP { LogoutReplyPacket logReply = (LogoutReplyPacket)PacketPool.Instance.GetPacket(PacketType.LogoutReply); // TODO: don't create new blocks if recycling an old packet - logReply.AgentData.AgentID = AgentId; - logReply.AgentData.SessionID = SessionId; + logReply.AgentData.AgentID = m_agentId; + logReply.AgentData.SessionID = m_sessionId; logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1]; logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock(); logReply.InventoryData[0].ItemID = UUID.Zero; @@ -3398,8 +3396,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP GrantGodlikePowersPacket.GrantDataBlock gdb = new GrantGodlikePowersPacket.GrantDataBlock(); GrantGodlikePowersPacket.AgentDataBlock adb = new GrantGodlikePowersPacket.AgentDataBlock(); - adb.AgentID = AgentId; - adb.SessionID = SessionId; // More security + adb.AgentID = m_agentId; + adb.SessionID = m_sessionId; // More security gdb.GodLevel = (byte)AdminLevel; gdb.Token = Token; //respondPacket.AgentData = (GrantGodlikePowersPacket.AgentDataBlock)ablock; @@ -3412,12 +3410,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP { UpdateGroupMembership(GroupMembership); - SendAgentGroupDataUpdate(AgentId,GroupMembership); + SendAgentGroupDataUpdate(m_agentId, GroupMembership); } public void SendSelectedPartsProprieties(List parts) { -/* not in use + /* not in use // udp part ObjectPropertiesPacket packet = (ObjectPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ObjectProperties); @@ -3454,8 +3452,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP OSDMap llsdBody = new OSDMap(1); llsdBody.Add("ObjectData", array); - eq.Enqueue(BuildEvent("ObjectPhysicsProperties", llsdBody),AgentId); -*/ + eq.Enqueue(BuildEvent("ObjectPhysicsProperties", llsdBody),m_agentId); + */ } @@ -3476,7 +3474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP float bounce = part.Restitution; float gravmod = part.GravityModifier; - eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId); + eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod, m_agentId); } @@ -3569,7 +3567,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLSDxmlEncode2.AddEndArray(sb); } - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } } @@ -3768,7 +3766,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP packet.QueryData = new DirPlacesReplyPacket.QueryDataBlock[1]; packet.QueryData[0] = new DirPlacesReplyPacket.QueryDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData[0].QueryID = queryID; @@ -3809,7 +3807,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP packet.QueryData = new DirPlacesReplyPacket.QueryDataBlock[1]; packet.QueryData[0] = new DirPlacesReplyPacket.QueryDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData[0].QueryID = queryID; @@ -3827,7 +3825,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DirPeopleReplyPacket packet = (DirPeopleReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirPeopleReply); packet.AgentData = new DirPeopleReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData = new DirPeopleReplyPacket.QueryDataBlock(); packet.QueryData.QueryID = queryID; @@ -3859,7 +3857,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DirEventsReplyPacket packet = (DirEventsReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirEventsReply); packet.AgentData = new DirEventsReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData = new DirEventsReplyPacket.QueryDataBlock(); packet.QueryData.QueryID = queryID; @@ -3895,7 +3893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DirGroupsReplyPacket packet = (DirGroupsReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirGroupsReply); packet.AgentData = new DirGroupsReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData = new DirGroupsReplyPacket.QueryDataBlock(); packet.QueryData.QueryID = queryID; @@ -3921,7 +3919,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DirClassifiedReplyPacket packet = (DirClassifiedReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirClassifiedReply); packet.AgentData = new DirClassifiedReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData = new DirClassifiedReplyPacket.QueryDataBlock(); packet.QueryData.QueryID = queryID; @@ -3955,7 +3953,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DirLandReplyPacket packet = (DirLandReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirLandReply); packet.AgentData = new DirLandReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData = new DirLandReplyPacket.QueryDataBlock(); packet.QueryData.QueryID = queryID; @@ -3985,7 +3983,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP DirPopularReplyPacket packet = (DirPopularReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirPopularReply); packet.AgentData = new DirPopularReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.QueryData = new DirPopularReplyPacket.QueryDataBlock(); packet.QueryData.QueryID = queryID; @@ -4012,7 +4010,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP EventInfoReplyPacket packet = (EventInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.EventInfoReply); packet.AgentData = new EventInfoReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.EventData = new EventInfoReplyPacket.EventDataBlock(); packet.EventData.EventID = data.eventID; @@ -4039,7 +4037,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OfferCallingCardPacket p = (OfferCallingCardPacket)PacketPool.Instance.GetPacket(PacketType.OfferCallingCard); p.AgentData.AgentID = srcID; p.AgentData.SessionID = UUID.Zero; - p.AgentBlock.DestID = AgentId; + p.AgentBlock.DestID = m_agentId; p.AgentBlock.TransactionID = transactionID; OutPacket(p, ThrottleOutPacketType.Task); } @@ -4047,7 +4045,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendAcceptCallingCard(UUID transactionID) { AcceptCallingCardPacket p = (AcceptCallingCardPacket)PacketPool.Instance.GetPacket(PacketType.AcceptCallingCard); - p.AgentData.AgentID = AgentId; + p.AgentData.AgentID = m_agentId; p.AgentData.SessionID = UUID.Zero; p.FolderData = new AcceptCallingCardPacket.FolderDataBlock[1]; p.FolderData[0] = new AcceptCallingCardPacket.FolderDataBlock(); @@ -4058,7 +4056,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendDeclineCallingCard(UUID transactionID) { DeclineCallingCardPacket p = (DeclineCallingCardPacket)PacketPool.Instance.GetPacket(PacketType.DeclineCallingCard); - p.AgentData.AgentID = AgentId; + p.AgentData.AgentID = m_agentId; p.AgentData.SessionID = UUID.Zero; p.TransactionBlock.TransactionID = transactionID; OutPacket(p, ThrottleOutPacketType.Task); @@ -4067,7 +4065,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendTerminateFriend(UUID exFriendID) { TerminateFriendshipPacket p = (TerminateFriendshipPacket)PacketPool.Instance.GetPacket(PacketType.TerminateFriendship); - p.AgentData.AgentID = AgentId; + p.AgentData.AgentID = m_agentId; p.AgentData.SessionID = SessionId; p.ExBlock.OtherID = exFriendID; OutPacket(p, ThrottleOutPacketType.Task); @@ -4084,11 +4082,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP osUTF8 sb = eq.StartEvent("AvatarGroupsReply"); LLSDxmlEncode2.AddArrayAndMap("AgentData", sb); - LLSDxmlEncode2.AddElem("AgentID", AgentId, sb); + LLSDxmlEncode2.AddElem("AgentID", m_agentId, sb); LLSDxmlEncode2.AddElem("AvatarID", avatarID, sb); LLSDxmlEncode2.AddEndMapAndArray(sb); - bool notSameAvatar = avatarID != AgentId; + bool notSameAvatar = avatarID != m_agentId; if(data.Length == 0) LLSDxmlEncode2.AddEmptyArray("GroupData", sb); else @@ -4110,12 +4108,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP } LLSDxmlEncode2.AddEndArray(sb); } - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } public void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data) { - if(avatarID != AgentId) + if(avatarID != m_agentId) m_log.Debug("[CLIENT]: SendAgentGroupDataUpdate avatarID != AgentId"); IEventQueue eq = this.Scene.RequestModuleInterface(); @@ -4151,7 +4149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP JoinGroupReplyPacket p = (JoinGroupReplyPacket)PacketPool.Instance.GetPacket(PacketType.JoinGroupReply); p.AgentData = new JoinGroupReplyPacket.AgentDataBlock(); - p.AgentData.AgentID = AgentId; + p.AgentData.AgentID = m_agentId; p.GroupData = new JoinGroupReplyPacket.GroupDataBlock(); p.GroupData.GroupID = groupID; @@ -4181,7 +4179,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP LeaveGroupReplyPacket p = (LeaveGroupReplyPacket)PacketPool.Instance.GetPacket(PacketType.LeaveGroupReply); p.AgentData = new LeaveGroupReplyPacket.AgentDataBlock(); - p.AgentData.AgentID = AgentId; + p.AgentData.AgentID = m_agentId; p.GroupData = new LeaveGroupReplyPacket.GroupDataBlock(); p.GroupData.GroupID = groupID; @@ -4200,7 +4198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.AvatarClassifiedReply); ac.AgentData = new AvatarClassifiedReplyPacket.AgentDataBlock(); - ac.AgentData.AgentID = AgentId; + ac.AgentData.AgentID = m_agentId; ac.AgentData.TargetID = targetID; ac.Data = new AvatarClassifiedReplyPacket.DataBlock[classifiedID.Length]; @@ -4225,7 +4223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.ClassifiedInfoReply); cr.AgentData = new ClassifiedInfoReplyPacket.AgentDataBlock(); - cr.AgentData.AgentID = AgentId; + cr.AgentData.AgentID = m_agentId; cr.Data = new ClassifiedInfoReplyPacket.DataBlock(); cr.Data.ClassifiedID = classifiedID; @@ -4254,7 +4252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.AgentDropGroup); dg.AgentData = new AgentDropGroupPacket.AgentDataBlock(); - dg.AgentData.AgentID = AgentId; + dg.AgentData.AgentID = m_agentId; dg.AgentData.GroupID = groupID; OutPacket(dg, ThrottleOutPacketType.Task); @@ -4267,7 +4265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.AvatarNotesReply); an.AgentData = new AvatarNotesReplyPacket.AgentDataBlock(); - an.AgentData.AgentID = AgentId; + an.AgentData.AgentID = m_agentId; an.Data = new AvatarNotesReplyPacket.DataBlock(); an.Data.TargetID = targetID; @@ -4283,7 +4281,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.AvatarPicksReply); ap.AgentData = new AvatarPicksReplyPacket.AgentDataBlock(); - ap.AgentData.AgentID = AgentId; + ap.AgentData.AgentID = m_agentId; ap.AgentData.TargetID = targetID; ap.Data = new AvatarPicksReplyPacket.DataBlock[picks.Count]; @@ -4307,7 +4305,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.AvatarClassifiedReply); ac.AgentData = new AvatarClassifiedReplyPacket.AgentDataBlock(); - ac.AgentData.AgentID = AgentId; + ac.AgentData.AgentID = m_agentId; ac.AgentData.TargetID = targetID; ac.Data = new AvatarClassifiedReplyPacket.DataBlock[classifieds.Count]; @@ -4331,7 +4329,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PacketType.ParcelDwellReply); pd.AgentData = new ParcelDwellReplyPacket.AgentDataBlock(); - pd.AgentData.AgentID = AgentId; + pd.AgentData.AgentID = m_agentId; pd.Data = new ParcelDwellReplyPacket.DataBlock(); pd.Data.LocalID = localID; @@ -4352,7 +4350,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP Visible = "default"; ur.AgentData = new UserInfoReplyPacket.AgentDataBlock(); - ur.AgentData.AgentID = AgentId; + ur.AgentData.AgentID = m_agentId; ur.UserData = new UserInfoReplyPacket.UserDataBlock(); ur.UserData.IMViaEMail = imViaEmail; @@ -4371,7 +4369,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP createGroupReply.ReplyData = new CreateGroupReplyPacket.ReplyDataBlock(); - createGroupReply.AgentData.AgentID = AgentId; + createGroupReply.AgentData.AgentID = m_agentId; createGroupReply.ReplyData.GroupID = groupID; createGroupReply.ReplyData.Success = success; @@ -4384,7 +4382,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP UseCachedMuteListPacket useCachedMuteList = (UseCachedMuteListPacket)PacketPool.Instance.GetPacket(PacketType.UseCachedMuteList); useCachedMuteList.AgentData = new UseCachedMuteListPacket.AgentDataBlock(); - useCachedMuteList.AgentData.AgentID = AgentId; + useCachedMuteList.AgentData.AgentID = m_agentId; OutPacket(useCachedMuteList, ThrottleOutPacketType.Task); } @@ -4393,7 +4391,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GenericMessagePacket gmp = new GenericMessagePacket(); - gmp.AgentData.AgentID = AgentId; + gmp.AgentData.AgentID = m_agentId; gmp.AgentData.SessionID = m_sessionId; gmp.AgentData.TransactionID = UUID.Zero; @@ -4410,7 +4408,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP MuteListUpdatePacket muteListUpdate = (MuteListUpdatePacket)PacketPool.Instance.GetPacket(PacketType.MuteListUpdate); muteListUpdate.MuteData = new MuteListUpdatePacket.MuteDataBlock(); - muteListUpdate.MuteData.AgentID = AgentId; + muteListUpdate.MuteData.AgentID = m_agentId; muteListUpdate.MuteData.Filename = Utils.StringToBytes(filename); OutPacket(muteListUpdate, ThrottleOutPacketType.Task); @@ -4421,7 +4419,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP PickInfoReplyPacket pickInfoReply = (PickInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.PickInfoReply); pickInfoReply.AgentData = new PickInfoReplyPacket.AgentDataBlock(); - pickInfoReply.AgentData.AgentID = AgentId; + pickInfoReply.AgentData.AgentID = m_agentId; pickInfoReply.Data = new PickInfoReplyPacket.DataBlock(); pickInfoReply.Data.PickID = pickID; @@ -4450,7 +4448,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendWearables(AvatarWearable[] wearables, int serial) { AgentWearablesUpdatePacket aw = (AgentWearablesUpdatePacket)PacketPool.Instance.GetPacket(PacketType.AgentWearablesUpdate); - aw.AgentData.AgentID = AgentId; + aw.AgentData.AgentID = m_agentId; aw.AgentData.SerialNum = (uint)serial; aw.AgentData.SessionID = m_sessionId; @@ -4559,7 +4557,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP int pos = 24; //self animations - if (sourceAgentId == AgentId) + if (sourceAgentId == m_agentId) { List withobjects = new List(animations.Length); List noobjects = new List(animations.Length); @@ -4737,7 +4735,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (i < totalAgents) { - if (users[i] == AgentId) + if (users[i] == m_agentId) selfindex = i; //if (doprey && users[i] == m_courseLocationPrey) // preyindex = i; @@ -4772,7 +4770,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { SceneObjectPart p = (SceneObjectPart)entity; SceneObjectGroup g = p.ParentGroup; - if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId) + if (g.HasPrivateAttachmentPoint && g.OwnerID != m_agentId) return; // Don't send updates for other people's HUDs if((updateFlags ^ PrimUpdateFlags.SendInTransit) == 0) @@ -4967,7 +4965,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } // Someone else's HUD, why are we getting these? - if (grp.HasPrivateAttachmentPoint && grp.OwnerID != AgentId) + if (grp.HasPrivateAttachmentPoint && grp.OwnerID != m_agentId) { update.Free(); continue; @@ -5915,7 +5913,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendInitiateDownload(string simFileName, string clientFileName) { InitiateDownloadPacket newPack = new InitiateDownloadPacket(); - newPack.AgentData.AgentID = AgentId; + newPack.AgentData.AgentID = m_agentId; newPack.FileData.SimFilename = Utils.StringToBytes(simFileName); newPack.FileData.ViewerFilename = Utils.StringToBytes(clientFileName); OutPacket(newPack, ThrottleOutPacketType.Asset); @@ -6235,7 +6233,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLSDxmlEncode2.AddEndMap(sb); } LLSDxmlEncode2.AddEndArray(sb); - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } } @@ -6366,7 +6364,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); packet.AgentData.TransactionID = UUID.Random(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.AgentData.SessionID = SessionId; packet.MethodData.Invoice = invoice; packet.MethodData.Method = Utils.StringToBytes("setaccess"); @@ -6433,7 +6431,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { RegionInfoPacket rinfopack = new RegionInfoPacket(); RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); - rinfopack.AgentData.AgentID = AgentId; + rinfopack.AgentData.AgentID = m_agentId; rinfopack.AgentData.SessionID = SessionId; rinfoblk.BillableFactor = args.billableFactor; rinfoblk.EstateID = args.estateID; @@ -6462,8 +6460,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP rinfopack.HasVariableBlocks = true; rinfopack.RegionInfo = rinfoblk; rinfopack.AgentData = new RegionInfoPacket.AgentDataBlock(); - rinfopack.AgentData.AgentID = AgentId; - rinfopack.AgentData.SessionID = SessionId; + rinfopack.AgentData.AgentID = m_agentId; + rinfopack.AgentData.SessionID = m_sessionId; rinfopack.RegionInfo3 = new RegionInfoPacket.RegionInfo3Block[0]; OutPacket(rinfopack, ThrottleOutPacketType.Task); @@ -6672,13 +6670,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLSDxmlEncode2.AddElem("RegionAllowAccessOverride", accessovr, sb); LLSDxmlEncode2.AddEndMapAndArray(sb); - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } public void SendLandAccessListData(List accessList, uint accessFlag, int localLandID) { ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); - replyPacket.Data.AgentID = AgentId; + replyPacket.Data.AgentID = m_agentId; replyPacket.Data.Flags = accessFlag; replyPacket.Data.LocalID = localLandID; replyPacket.Data.SequenceID = 0; @@ -8363,7 +8361,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet; AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData; - if (x.AgentID != AgentId || x.SessionID != SessionId) + if (x.AgentID != m_agentId || x.SessionID != m_sessionId) return; uint seq = packet.Header.Sequence; @@ -8436,8 +8434,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; MoneyTransferRequestPacket money = (MoneyTransferRequestPacket)Pack; // validate the agent owns the agentID and sessionID - if (money.MoneyData.SourceID == AgentId && money.AgentData.AgentID == AgentId && - money.AgentData.SessionID == SessionId) + if (money.MoneyData.SourceID == m_agentId && money.AgentData.AgentID == m_agentId && + money.AgentData.SessionID == m_sessionId) { OnMoneyTransferRequest?.Invoke(money.MoneyData.SourceID, money.MoneyData.DestID, money.MoneyData.Amount, money.MoneyData.TransactionType, @@ -8451,11 +8449,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelGodMarkAsContentPacket ParcelGodMarkAsContent = (ParcelGodMarkAsContentPacket)packet; - if(SessionId != ParcelGodMarkAsContent.AgentData.SessionID || AgentId != ParcelGodMarkAsContent.AgentData.AgentID) + if(m_sessionId != ParcelGodMarkAsContent.AgentData.SessionID || m_agentId != ParcelGodMarkAsContent.AgentData.AgentID) return; OnParcelGodMark?.Invoke(this, - ParcelGodMarkAsContent.AgentData.AgentID, + m_agentId, ParcelGodMarkAsContent.ParcelData.LocalID); } @@ -8465,11 +8463,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; FreezeUserPacket FreezeUser = (FreezeUserPacket)packet; - if(SessionId != FreezeUser.AgentData.SessionID || AgentId != FreezeUser.AgentData.AgentID) + if(m_sessionId != FreezeUser.AgentData.SessionID || m_agentId != FreezeUser.AgentData.AgentID) return; OnParcelFreezeUser?.Invoke(this, - FreezeUser.AgentData.AgentID, + m_agentId, FreezeUser.Data.Flags, FreezeUser.Data.TargetID); } @@ -8480,11 +8478,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; EjectUserPacket EjectUser = (EjectUserPacket)packet; - if(SessionId != EjectUser.AgentData.SessionID || AgentId != EjectUser.AgentData.AgentID) + if(m_sessionId != EjectUser.AgentData.SessionID || m_agentId != EjectUser.AgentData.AgentID) return; OnParcelEjectUser?.Invoke(this, - EjectUser.AgentData.AgentID, + m_agentId, EjectUser.Data.Flags, EjectUser.Data.TargetID); } @@ -8496,20 +8494,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP ParcelBuyPassPacket ParcelBuyPass = (ParcelBuyPassPacket)packet; - if(SessionId != ParcelBuyPass.AgentData.SessionID || AgentId != ParcelBuyPass.AgentData.AgentID) + if(m_sessionId != ParcelBuyPass.AgentData.SessionID || m_agentId != ParcelBuyPass.AgentData.AgentID) return; OnParcelBuyPass?.Invoke(this, - ParcelBuyPass.AgentData.AgentID, + m_agentId, ParcelBuyPass.ParcelData.LocalID); } private void HandleParcelBuyRequest(Packet Pack) { ParcelBuyPacket parcel = (ParcelBuyPacket)Pack; - if (parcel.AgentData.AgentID == AgentId && parcel.AgentData.SessionID == SessionId) + if (parcel.AgentData.AgentID == m_agentId && parcel.AgentData.SessionID == m_sessionId) { - OnParcelBuy?.Invoke(parcel.AgentData.AgentID, parcel.Data.GroupID, parcel.Data.Final, + OnParcelBuy?.Invoke(m_agentId, parcel.Data.GroupID, parcel.Data.Final, parcel.Data.IsGroupOwned, parcel.Data.RemoveContribution, parcel.Data.LocalID, parcel.ParcelData.Area, parcel.ParcelData.Price, @@ -8539,7 +8537,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GenericMessagePacket gmpack = (GenericMessagePacket)pack; - if (gmpack.AgentData.SessionID != SessionId || gmpack.AgentData.AgentID != AgentId) + if (gmpack.AgentData.SessionID != m_sessionId || gmpack.AgentData.AgentID != m_agentId) return; string method = Util.FieldToString(gmpack.MethodData.Method).ToLower().Trim(); @@ -8574,7 +8572,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; - if (ogpack.AgentData.SessionID != SessionId) + if (ogpack.AgentData.SessionID != m_sessionId) return; for (int i = 0; i < ogpack.ObjectData.Length; i++) @@ -8589,7 +8587,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; - if (viewer.AgentData.SessionID != SessionId || AgentId != viewer.AgentData.AgentID) + if (viewer.AgentData.SessionID != m_sessionId || m_agentId != viewer.AgentData.AgentID) return; int length = viewer.Effect.Length; @@ -8612,7 +8610,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleVelocityInterpolateOff(Packet Pack) { VelocityInterpolateOffPacket p = (VelocityInterpolateOffPacket)Pack; - if (p.AgentData.SessionID != SessionId || p.AgentData.AgentID != AgentId) + if (p.AgentData.SessionID != m_sessionId || p.AgentData.AgentID != m_agentId) return ; m_VelocityInterpolate = false; @@ -8621,7 +8619,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleVelocityInterpolateOn(Packet Pack) { VelocityInterpolateOnPacket p = (VelocityInterpolateOnPacket)Pack; - if (p.AgentData.SessionID != SessionId || p.AgentData.AgentID != AgentId) + if (p.AgentData.SessionID != m_sessionId || p.AgentData.AgentID != m_agentId) return; m_VelocityInterpolate = true; @@ -8631,7 +8629,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; - if (avatarProperties.AgentData.SessionID != SessionId || avatarProperties.AgentData.AgentID != AgentId) + if (avatarProperties.AgentData.SessionID != m_sessionId || avatarProperties.AgentData.AgentID != m_agentId) return; OnRequestAvatarProperties?.Invoke(this, avatarProperties.AgentData.AvatarID); @@ -8644,7 +8642,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack; - if (inchatpack.AgentData.SessionID != SessionId || inchatpack.AgentData.AgentID != AgentId) + if (inchatpack.AgentData.SessionID != m_sessionId || inchatpack.AgentData.AgentID != m_agentId) return; string fromName = String.Empty; //ClientAvatar.firstname + " " + ClientAvatar.lastname; @@ -8664,7 +8662,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP args.Scene = Scene; args.Sender = this; - args.SenderUUID = this.AgentId; + args.SenderUUID = m_agentId; OnChatFromClient?.Invoke(this, args); } @@ -8676,12 +8674,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP AvatarPropertiesUpdatePacket avatarProps = (AvatarPropertiesUpdatePacket)Pack; - if (avatarProps.AgentData.SessionID != SessionId || avatarProps.AgentData.AgentID != AgentId) + if (avatarProps.AgentData.SessionID != m_sessionId || avatarProps.AgentData.AgentID != m_agentId) return; AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = avatarProps.PropertiesData; UserProfileData UserProfile = new UserProfileData(); - UserProfile.ID = AgentId; + UserProfile.ID = m_agentId; UserProfile.AboutText = Utils.BytesToString(Properties.AboutText); UserProfile.FirstLifeAboutText = Utils.BytesToString(Properties.FLAboutText); UserProfile.FirstLifeImage = Properties.FLImageID; @@ -8701,7 +8699,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID); - if (rdialog.AgentData.SessionID != SessionId || rdialog.AgentData.AgentID != AgentId) + if (rdialog.AgentData.SessionID != m_sessionId || rdialog.AgentData.AgentID != m_agentId) return; int ch = rdialog.Data.ChatChannel; @@ -8725,7 +8723,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; - if (msgpack.AgentData.SessionID != SessionId || msgpack.AgentData.AgentID != AgentId) + if (msgpack.AgentData.SessionID != m_sessionId || msgpack.AgentData.AgentID != m_agentId) return; string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); @@ -8753,7 +8751,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; AcceptFriendshipPacket afriendpack = (AcceptFriendshipPacket)Pack; - if (afriendpack.AgentData.SessionID != SessionId || afriendpack.AgentData.AgentID != AgentId) + if (afriendpack.AgentData.SessionID != m_sessionId || afriendpack.AgentData.AgentID != m_agentId) return; // My guess is this is the folder to stick the calling card into @@ -8772,7 +8770,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { DeclineFriendshipPacket dfriendpack = (DeclineFriendshipPacket)Pack; - if (dfriendpack.AgentData.SessionID != SessionId || dfriendpack.AgentData.AgentID != AgentId) + if (dfriendpack.AgentData.SessionID != m_sessionId || dfriendpack.AgentData.AgentID != m_agentId) return; OnDenyFriendRequest?.Invoke(this, @@ -8784,7 +8782,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; - if (tfriendpack.AgentData.SessionID != SessionId || tfriendpack.AgentData.AgentID != AgentId) + if (tfriendpack.AgentData.SessionID != m_sessionId || tfriendpack.AgentData.AgentID != m_agentId) return; UUID exFriendID = tfriendpack.ExBlock.OtherID; @@ -8802,7 +8800,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { TrackAgentPacket TrackAgent = (TrackAgentPacket)packet; - if(TrackAgent.AgentData.AgentID != AgentId || TrackAgent.AgentData.SessionID != SessionId) + if(TrackAgent.AgentData.AgentID != m_agentId || TrackAgent.AgentData.SessionID != m_sessionId) return; OnTrackAgent?.Invoke(this, @@ -8814,7 +8812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { RezObjectPacket rezPacket = (RezObjectPacket)Pack; - if (rezPacket.AgentData.SessionID != SessionId || rezPacket.AgentData.AgentID != AgentId) + if (rezPacket.AgentData.SessionID != m_sessionId || rezPacket.AgentData.AgentID != m_agentId) return; UUID rezGroupID = rezPacket.AgentData.GroupID; @@ -8832,7 +8830,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public List objectids; public HashSet rcvedpackets; } - private ConcurrentDictionary m_DeRezObjectDelayed; + private Dictionary m_DeRezObjectDelayed; private void HandlerDeRezObject(Packet Pack) { @@ -8840,20 +8838,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)Pack; - - if (DeRezPacket.AgentData.SessionID != SessionId || DeRezPacket.AgentData.AgentID != AgentId) + DeRezObjectPacket.AgentDataBlock DeRezPacketAgentData = DeRezPacket.AgentData; + if (DeRezPacketAgentData.SessionID != m_sessionId || DeRezPacketAgentData.AgentID != m_agentId) return; List deRezIDs; - DeRezAction action = (DeRezAction)DeRezPacket.AgentBlock.Destination; - int numberPackets = DeRezPacket.AgentBlock.PacketCount; - int curPacket = DeRezPacket.AgentBlock.PacketNumber; - UUID id = DeRezPacket.AgentBlock.TransactionID; + DeRezObjectPacket.AgentBlockBlock DeRezPacketAgentBlock = DeRezPacket.AgentBlock; + DeRezAction action = (DeRezAction)DeRezPacketAgentBlock.Destination; + int numberPackets = DeRezPacketAgentBlock.PacketCount; + int curPacket = DeRezPacketAgentBlock.PacketNumber; + UUID id = DeRezPacketAgentBlock.TransactionID; if (numberPackets > 1) { if(m_DeRezObjectDelayed == null) - m_DeRezObjectDelayed = new ConcurrentDictionary(); + m_DeRezObjectDelayed = new Dictionary(); if (!m_DeRezObjectDelayed.TryGetValue(id, out DeRezObjectInfo info)) { @@ -8879,7 +8878,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (info.rcvedpackets.Count < numberPackets) return; - m_DeRezObjectDelayed.TryRemove(id, out info); + m_DeRezObjectDelayed.Remove(id); info.objectids = null; info.rcvedpackets = null; } @@ -8892,15 +8891,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - OnDeRezObject?.Invoke(this, deRezIDs, DeRezPacket.AgentBlock.GroupID, - action, DeRezPacket.AgentBlock.DestinationID); + OnDeRezObject?.Invoke(this, deRezIDs, DeRezPacketAgentBlock.GroupID, + action, DeRezPacketAgentBlock.DestinationID); } private void HandlerRezRestoreToWorld(Packet Pack) { RezRestoreToWorldPacket restore = (RezRestoreToWorldPacket)Pack; - if (restore.AgentData.SessionID != SessionId || restore.AgentData.AgentID != AgentId) + if (restore.AgentData.SessionID != m_sessionId || restore.AgentData.AgentID != m_agentId) return; OnRezRestoreToWorld?.Invoke(this, restore.InventoryData.ItemID); @@ -8916,13 +8915,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (modify.ParcelData.Length == 0) return; - if (modify.AgentData.SessionID != SessionId || modify.AgentData.AgentID != AgentId) + if (modify.AgentData.SessionID != m_sessionId || modify.AgentData.AgentID != m_agentId) return; //m_log.Info("[LAND]: LAND:" + modify.ToString()); for (int i = 0; i < modify.ParcelData.Length; i++) { - OnModifyTerrain?.Invoke(AgentId, modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, + OnModifyTerrain?.Invoke(m_agentId, modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlockExtended[i].BrushSize, modify.ModifyBlock.Action, modify.ParcelData[i].North, modify.ParcelData[i].West, modify.ParcelData[i].South, modify.ParcelData[i].East, @@ -8961,7 +8960,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; - if (appear.AgentData.SessionID != SessionId || appear.AgentData.AgentID != AgentId) + if (appear.AgentData.SessionID != m_sessionId || appear.AgentData.AgentID != m_agentId) return; try @@ -9000,7 +8999,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AgentIsNowWearingPacket nowWearing = (AgentIsNowWearingPacket)Pack; - if (nowWearing.AgentData.SessionID != SessionId || nowWearing.AgentData.AgentID != AgentId) + if (nowWearing.AgentData.SessionID != m_sessionId || nowWearing.AgentData.AgentID != m_agentId) return; AvatarWearingArgs wearingArgs = new AvatarWearingArgs(); @@ -9019,7 +9018,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandlerRezSingleAttachmentFromInv(Packet Pack) { RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack; - if (rez.AgentData.SessionID != SessionId || rez.AgentData.AgentID != AgentId) + if (rez.AgentData.SessionID != m_sessionId || rez.AgentData.AgentID != m_agentId) return; OnRezSingleAttachmentFromInv?.Invoke(this, rez.ObjectData.ItemID, @@ -9032,7 +9031,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; RezMultipleAttachmentsFromInvPacket rez = (RezMultipleAttachmentsFromInvPacket)Pack; - if (rez.AgentData.SessionID != SessionId || rez.AgentData.AgentID != AgentId) + RezMultipleAttachmentsFromInvPacket.AgentDataBlock rezAgentData = rez.AgentData; + if (rezAgentData.SessionID != m_sessionId || rezAgentData.AgentID != m_agentId) return; List> rezlist = new List>(); @@ -9048,7 +9048,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; DetachAttachmentIntoInvPacket detachtoInv = (DetachAttachmentIntoInvPacket)Pack; - if(detachtoInv.ObjectData.AgentID != AgentId) + if(detachtoInv.ObjectData.AgentID != m_agentId) return; OnDetachAttachmentIntoInv?.Invoke(detachtoInv.ObjectData.ItemID, this); @@ -9060,7 +9060,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectAttachPacket att = (ObjectAttachPacket)Pack; - if (att.AgentData.SessionID != SessionId || att.AgentData.AgentID != AgentId) + if (att.AgentData.SessionID != m_sessionId || att.AgentData.AgentID != m_agentId) return; if (att.ObjectData.Length > 0) @@ -9073,7 +9073,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectDetachPacket dett = (ObjectDetachPacket)Pack; - if (dett.AgentData.SessionID != SessionId || dett.AgentData.AgentID != AgentId) + if (dett.AgentData.SessionID != m_sessionId || dett.AgentData.AgentID != m_agentId) return; for (int j = 0; j < dett.ObjectData.Length; j++) @@ -9090,7 +9090,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP ObjectDropPacket dropp = (ObjectDropPacket)Pack; - if (dropp.AgentData.SessionID != SessionId || dropp.AgentData.AgentID != AgentId) + if (dropp.AgentData.SessionID != m_sessionId || dropp.AgentData.AgentID != m_agentId) return; for (int j = 0; j < dropp.ObjectData.Length; j++) @@ -9104,7 +9104,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack; - if (run.AgentData.SessionID != SessionId || run.AgentData.AgentID != AgentId) + if (run.AgentData.SessionID != m_sessionId || run.AgentData.AgentID != m_agentId) return; OnSetAlwaysRun?.Invoke(this, run.AgentData.AlwaysRun); @@ -9127,7 +9127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; - if (AgentAni.AgentData.SessionID != SessionId || AgentAni.AgentData.AgentID != AgentId) + if (AgentAni.AgentData.SessionID != m_sessionId || AgentAni.AgentData.AgentID != m_agentId) return; for (int i = 0; i < AgentAni.AnimationList.Length; i++) @@ -9143,7 +9143,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack; - if (agentRequestSit.AgentData.SessionID != SessionId || agentRequestSit.AgentData.AgentID != AgentId) + if (agentRequestSit.AgentData.SessionID != m_sessionId || agentRequestSit.AgentData.AgentID != m_agentId) return; if (SceneAgent.IsChildAgent) @@ -9162,7 +9162,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; AgentSitPacket agentSit = (AgentSitPacket)Pack; - if (agentSit.AgentData.SessionID != SessionId || agentSit.AgentData.AgentID != AgentId) + if (agentSit.AgentData.SessionID != m_sessionId || agentSit.AgentData.AgentID != m_agentId) return; if (SceneAgent.IsChildAgent) @@ -9187,8 +9187,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack; // UUIDS are sent as zeroes by the client, substitute agent's id - OnSoundTrigger?.Invoke(soundTriggerPacket.SoundData.SoundID, AgentId, - AgentId, AgentId, + OnSoundTrigger?.Invoke(soundTriggerPacket.SoundData.SoundID, m_agentId, + m_agentId, m_agentId, soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position, soundTriggerPacket.SoundData.Handle); } @@ -9197,7 +9197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; - if (avRequestQuery.AgentData.SessionID != SessionId || avRequestQuery.AgentData.AgentID != AgentId) + if (avRequestQuery.AgentData.SessionID != m_sessionId || avRequestQuery.AgentData.AgentID != m_agentId) return; AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; @@ -9212,7 +9212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack; - if (avRequestDataUpdatePacket.AgentData.SessionID != SessionId || avRequestDataUpdatePacket.AgentData.AgentID != AgentId) + if (avRequestDataUpdatePacket.AgentData.SessionID != m_sessionId || avRequestDataUpdatePacket.AgentData.AgentID != m_agentId) return; OnAgentDataUpdateRequest?.Invoke(this, avRequestDataUpdatePacket.AgentData.AgentID, avRequestDataUpdatePacket.AgentData.SessionID); @@ -9236,7 +9236,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UpdateUserInfoPacket updateUserInfo = (UpdateUserInfoPacket)Pack; - if (updateUserInfo.AgentData.SessionID != SessionId || updateUserInfo.AgentData.AgentID != AgentId) + if (updateUserInfo.AgentData.SessionID != m_sessionId || updateUserInfo.AgentData.AgentID != m_agentId) return; bool visible = true; @@ -9251,8 +9251,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP { SetStartLocationRequestPacket avSetStartLocationRequestPacket = (SetStartLocationRequestPacket)Pack; - if (avSetStartLocationRequestPacket.AgentData.SessionID != SessionId || - avSetStartLocationRequestPacket.AgentData.AgentID != AgentId) + if (avSetStartLocationRequestPacket.AgentData.SessionID != m_sessionId || + avSetStartLocationRequestPacket.AgentData.AgentID != m_agentId) return; float packX = avSetStartLocationRequestPacket.StartLocationData.LocationPos.X; @@ -9261,7 +9261,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (packX == 255.5f || packY == 255.5f) { ScenePresence avatar = null; - if (((Scene)m_scene).TryGetScenePresence(AgentId, out avatar)) + if (((Scene)m_scene).TryGetScenePresence(m_agentId, out avatar)) { if (packX == 255.5f) { @@ -9283,7 +9283,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { AgentThrottlePacket atpack = (AgentThrottlePacket)Pack; - if (atpack.AgentData.SessionID != SessionId || atpack.AgentData.AgentID != AgentId) + if (atpack.AgentData.SessionID != m_sessionId || atpack.AgentData.AgentID != m_agentId) return; m_udpClient.SetThrottles(atpack.Throttle.Throttles); @@ -9303,7 +9303,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleForceScriptControlRelease(Packet Pack) { - OnForceReleaseControls?.Invoke(this, AgentId); + OnForceReleaseControls?.Invoke(this, m_agentId); } #endregion Scene/Avatar @@ -9314,7 +9314,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { ObjectLinkPacket link = (ObjectLinkPacket)Pack; - if (link.AgentData.SessionID != SessionId || link.AgentData.AgentID != AgentId) + if (link.AgentData.SessionID != m_sessionId || link.AgentData.AgentID != m_agentId) return; uint parentprimid = 0; @@ -9335,7 +9335,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { ObjectDelinkPacket delink = (ObjectDelinkPacket)Pack; - if (delink.AgentData.SessionID != SessionId || delink.AgentData.AgentID != AgentId) + if (delink.AgentData.SessionID != m_sessionId || delink.AgentData.AgentID != m_agentId) return; // It appears the prim at index 0 is not always the root prim (for @@ -9355,12 +9355,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP { ObjectAddPacket addPacket = (ObjectAddPacket)Pack; - if (addPacket.AgentData.SessionID != SessionId || addPacket.AgentData.AgentID != AgentId) + if (addPacket.AgentData.SessionID != m_sessionId || addPacket.AgentData.AgentID != m_agentId) return; ObjectAddPacket.ObjectDataBlock datablk = addPacket.ObjectData; PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); - OnAddPrim?.Invoke(AgentId, addPacket.AgentData.GroupID, datablk.RayEnd, + OnAddPrim?.Invoke(m_agentId, addPacket.AgentData.GroupID, datablk.RayEnd, datablk.Rotation, shape, datablk.BypassRaycast, datablk.RayStart, datablk.RayTargetID, datablk.RayEndIsIntersection, datablk.AddFlags); @@ -9372,7 +9372,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectShapePacket shapePacket = (ObjectShapePacket)Pack; - if (shapePacket.AgentData.SessionID != SessionId || shapePacket.AgentData.AgentID != AgentId) + if (shapePacket.AgentData.SessionID != m_sessionId || shapePacket.AgentData.AgentID != m_agentId) return; for (int i = 0; i < shapePacket.ObjectData.Length; i++) @@ -9406,7 +9406,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleObjectExtraParams(Packet Pack) { ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket)Pack; - if (extraPar.AgentData.SessionID != SessionId || extraPar.AgentData.AgentID != AgentId) + if (extraPar.AgentData.SessionID != m_sessionId || extraPar.AgentData.AgentID != m_agentId) return; ObjectExtraParams handlerUpdateExtraParams = OnUpdateExtraParams; @@ -9427,7 +9427,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack; - if (dupe.AgentData.SessionID != SessionId || dupe.AgentData.AgentID != AgentId) + if (dupe.AgentData.SessionID != m_sessionId || dupe.AgentData.AgentID != m_agentId) return; // ObjectDuplicatePacket.AgentDataBlock AgentandGroupData = dupe.AgentData; @@ -9438,7 +9438,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if(!IsGroupMember(rezGroupID)) rezGroupID = UUID.Zero; OnObjectDuplicate?.Invoke(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, - dupe.SharedData.DuplicateFlags, AgentId, + dupe.SharedData.DuplicateFlags, m_agentId, rezGroupID); } } @@ -9449,7 +9449,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; RequestMultipleObjectsPacket incomingRequest = (RequestMultipleObjectsPacket)Pack; - if (incomingRequest.AgentData.SessionID != SessionId || incomingRequest.AgentData.AgentID != AgentId) + if (incomingRequest.AgentData.SessionID != m_sessionId || incomingRequest.AgentData.AgentID != m_agentId) return; for (int i = 0; i < incomingRequest.ObjectData.Length; i++) @@ -9462,7 +9462,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; - if (incomingselect.AgentData.SessionID != SessionId || incomingselect.AgentData.AgentID != AgentId) + if (incomingselect.AgentData.SessionID != m_sessionId || incomingselect.AgentData.AgentID != m_agentId) return; List thisSelection = new List(); @@ -9478,7 +9478,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack; - if (incomingdeselect.AgentData.SessionID != SessionId || incomingdeselect.AgentData.AgentID != AgentId) + if (incomingdeselect.AgentData.SessionID != m_sessionId || incomingdeselect.AgentData.AgentID != m_agentId) return; for (int i = 0; i < incomingdeselect.ObjectData.Length; i++) @@ -9494,7 +9494,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // DEPRECATED: but till libsecondlife removes it, people will use it ObjectPositionPacket position = (ObjectPositionPacket)Pack; - if (position.AgentData.SessionID != SessionId || position.AgentData.AgentID != AgentId) + if (position.AgentData.SessionID != m_sessionId || position.AgentData.AgentID != m_agentId) return; for (int i = 0; i < position.ObjectData.Length; i++) @@ -9508,7 +9508,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // DEPRECATED: but till libsecondlife removes it, people will use it ObjectScalePacket scale = (ObjectScalePacket)Pack; - if (scale.AgentData.SessionID != SessionId || scale.AgentData.AgentID != AgentId) + if (scale.AgentData.SessionID != m_sessionId || scale.AgentData.AgentID != m_agentId) return; for (int i = 0; i < scale.ObjectData.Length; i++) @@ -9523,7 +9523,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // DEPRECATED: but till libsecondlife removes it, people will use it ObjectRotationPacket rotation = (ObjectRotationPacket)Pack; - if (rotation.AgentData.SessionID != SessionId || rotation.AgentData.AgentID != AgentId) + if (rotation.AgentData.SessionID != m_sessionId || rotation.AgentData.AgentID != m_agentId) return; for (int i = 0; i < rotation.ObjectData.Length; i++) @@ -9536,7 +9536,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; - if (flags.AgentData.SessionID != SessionId || flags.AgentData.AgentID != AgentId) + if (flags.AgentData.SessionID != m_sessionId || flags.AgentData.AgentID != m_agentId) return; // byte[] data = Pack.ToBytes(); @@ -9581,7 +9581,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectImagePacket imagePack = (ObjectImagePacket)Pack; - if (imagePack.AgentData.SessionID != SessionId || imagePack.AgentData.AgentID != AgentId) + if (imagePack.AgentData.SessionID != m_sessionId || imagePack.AgentData.AgentID != m_agentId) return; double now = Util.GetTimeStampMS(); @@ -9617,7 +9617,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectGrabPacket grab = (ObjectGrabPacket)Pack; - if (grab.AgentData.SessionID != SessionId || grab.AgentData.AgentID != AgentId) + if (grab.AgentData.SessionID != m_sessionId || grab.AgentData.AgentID != m_agentId) return; List touchArgs = new List(); @@ -9644,7 +9644,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectGrabUpdatePacket grabUpdate = (ObjectGrabUpdatePacket)Pack; - if (grabUpdate.AgentData.SessionID != SessionId || grabUpdate.AgentData.AgentID != AgentId) + if (grabUpdate.AgentData.SessionID != m_sessionId || grabUpdate.AgentData.AgentID != m_agentId) return; List touchArgs = new List(); @@ -9674,7 +9674,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP ObjectDeGrabPacket deGrab = (ObjectDeGrabPacket)Pack; - if (deGrab.AgentData.SessionID != SessionId || deGrab.AgentData.AgentID != AgentId) + if (deGrab.AgentData.SessionID != m_sessionId || deGrab.AgentData.AgentID != m_agentId) return; List touchArgs = new List(); @@ -9699,7 +9699,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //m_log.Warn("[CLIENT]: unhandled ObjectSpinStart packet"); ObjectSpinStartPacket spinStart = (ObjectSpinStartPacket)Pack; - if (spinStart.AgentData.SessionID != SessionId || spinStart.AgentData.AgentID != AgentId) + if (spinStart.AgentData.SessionID != m_sessionId || spinStart.AgentData.AgentID != m_agentId) return; OnSpinStart?.Invoke(spinStart.ObjectData.ObjectID, this); @@ -9709,7 +9709,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //m_log.Warn("[CLIENT]: unhandled ObjectSpinUpdate packet"); ObjectSpinUpdatePacket spinUpdate = (ObjectSpinUpdatePacket)Pack; - if (spinUpdate.AgentData.SessionID != SessionId || spinUpdate.AgentData.AgentID != AgentId) + if (spinUpdate.AgentData.SessionID != m_sessionId || spinUpdate.AgentData.AgentID != m_agentId) return; Vector3 axis; @@ -9724,7 +9724,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //m_log.Warn("[CLIENT]: unhandled ObjectSpinStop packet"); ObjectSpinStopPacket spinStop = (ObjectSpinStopPacket)Pack; - if (spinStop.AgentData.SessionID != SessionId || spinStop.AgentData.AgentID != AgentId) + if (spinStop.AgentData.SessionID != m_sessionId || spinStop.AgentData.AgentID != m_agentId) return; OnSpinStop?.Invoke(spinStop.ObjectData.ObjectID, this); @@ -9736,7 +9736,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack; - if (objDes.AgentData.SessionID != SessionId || objDes.AgentData.AgentID != AgentId) + if (objDes.AgentData.SessionID != m_sessionId || objDes.AgentData.AgentID != m_agentId) return; for (int i = 0; i < objDes.ObjectData.Length; i++) @@ -9750,7 +9750,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectNamePacket objName = (ObjectNamePacket)Pack; - if (objName.AgentData.SessionID != SessionId || objName.AgentData.AgentID != AgentId) + if (objName.AgentData.SessionID != m_sessionId || objName.AgentData.AgentID != m_agentId) return; for (int i = 0; i < objName.ObjectData.Length; i++) @@ -9765,10 +9765,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP ObjectPermissionsPacket newobjPerms = (ObjectPermissionsPacket)Pack; UUID SessionID = newobjPerms.AgentData.SessionID; - if (SessionID != SessionId) + if (SessionID != m_sessionId) return; UUID AgentID = newobjPerms.AgentData.AgentID; - if(AgentID != AgentId) + if(AgentID != m_agentId) return; for (int i = 0; i < newobjPerms.ObjectData.Length; i++) @@ -9802,7 +9802,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UndoPacket undoitem = (UndoPacket)Pack; - if (undoitem.AgentData.SessionID != SessionId || undoitem.AgentData.AgentID != AgentId) + if (undoitem.AgentData.SessionID != m_sessionId || undoitem.AgentData.AgentID != m_agentId) return; for (int i = 0; i < undoitem.ObjectData.Length; i++) @@ -9812,7 +9812,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleLandUndo(Packet Pack) { UndoLandPacket undolanditem = (UndoLandPacket)Pack; - if (undolanditem.AgentData.SessionID != SessionId || undolanditem.AgentData.AgentID != AgentId) + if (undolanditem.AgentData.SessionID != m_sessionId || undolanditem.AgentData.AgentID != m_agentId) return; OnLandUndo?.Invoke(this); @@ -9824,7 +9824,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; RedoPacket redoitem = (RedoPacket)Pack; - if (redoitem.AgentData.SessionID != SessionId || redoitem.AgentData.AgentID != AgentId) + if (redoitem.AgentData.SessionID != m_sessionId || redoitem.AgentData.AgentID != m_agentId) return; for (int i = 0; i < redoitem.ObjectData.Length; i++) @@ -9837,7 +9837,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectDuplicateOnRayPacket dupeOnRay = (ObjectDuplicateOnRayPacket)Pack; - if (dupeOnRay.AgentData.SessionID != SessionId || dupeOnRay.AgentData.AgentID != AgentId) + if (dupeOnRay.AgentData.SessionID != m_sessionId || dupeOnRay.AgentData.AgentID != m_agentId) return; for (int i = 0; i < dupeOnRay.ObjectData.Length; i++) @@ -9847,7 +9847,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP rezGroupID = UUID.Zero; OnObjectDuplicateOnRay?.Invoke(dupeOnRay.ObjectData[i].ObjectLocalID, - dupeOnRay.AgentData.DuplicateFlags, AgentId, rezGroupID, + dupeOnRay.AgentData.DuplicateFlags, m_agentId, rezGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, @@ -9859,7 +9859,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //This powers the little tooltip that appears when you move your mouse over an object RequestObjectPropertiesFamilyPacket packToolTip = (RequestObjectPropertiesFamilyPacket)Pack; - if (packToolTip.AgentData.SessionID != SessionId || packToolTip.AgentData.AgentID != AgentId) + if (packToolTip.AgentData.SessionID != m_sessionId || packToolTip.AgentData.AgentID != m_agentId) return; RequestObjectPropertiesFamilyPacket.ObjectDataBlock packObjBlock = packToolTip.ObjectData; @@ -9875,7 +9875,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //This lets us set objects to appear in search (stuff like DataSnapshot, etc) ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack; - if (packInSearch.AgentData.SessionID != SessionId || packInSearch.AgentData.AgentID != AgentId) + if (packInSearch.AgentData.SessionID != m_sessionId || packInSearch.AgentData.AgentID != m_agentId) return; foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData) @@ -9889,7 +9889,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleScriptAnswerYes(Packet Pack) { ScriptAnswerYesPacket scriptAnswer = (ScriptAnswerYesPacket)Pack; - if (scriptAnswer.AgentData.SessionID != SessionId || scriptAnswer.AgentData.AgentID != AgentId) + if (scriptAnswer.AgentData.SessionID != m_sessionId || scriptAnswer.AgentData.AgentID != m_agentId) return; OnScriptAnswer?.Invoke(this, scriptAnswer.Data.TaskID, scriptAnswer.Data.ItemID, scriptAnswer.Data.Questions); @@ -9901,7 +9901,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectClickActionPacket ocpacket = (ObjectClickActionPacket)Pack; - if (ocpacket.AgentData.SessionID != SessionId || ocpacket.AgentData.AgentID != AgentId) + if (ocpacket.AgentData.SessionID != m_sessionId || ocpacket.AgentData.AgentID != m_agentId) return; foreach (ObjectClickActionPacket.ObjectDataBlock odata in ocpacket.ObjectData) @@ -9918,7 +9918,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectMaterialPacket ompacket = (ObjectMaterialPacket)Pack; - if (ompacket.AgentData.SessionID != SessionId || ompacket.AgentData.AgentID != AgentId) + if (ompacket.AgentData.SessionID != m_sessionId || ompacket.AgentData.AgentID != m_agentId) return; foreach (ObjectMaterialPacket.ObjectDataBlock odata in ompacket.ObjectData) @@ -9936,7 +9936,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRequestImage(Packet Pack) { RequestImagePacket imageRequest = (RequestImagePacket)Pack; - if (imageRequest.AgentData.SessionID != SessionId || imageRequest.AgentData.AgentID != AgentId) + if (imageRequest.AgentData.SessionID != m_sessionId || imageRequest.AgentData.AgentID != m_agentId) return; //handlerTextureRequest = null; @@ -10037,19 +10037,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (tii.Type == (int)AssetType.LSLText) { - if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId)) + if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, m_agentId)) return; } else if (tii.Type == (int)AssetType.Notecard) { - if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId)) + if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, m_agentId)) return; } else { // TODO: Change this code to allow items other than notecards and scripts to be successfully // shared with group. In fact, this whole block of permissions checking should move to an IPermissionsModule - if (part.OwnerID != AgentId) + if (part.OwnerID != m_agentId) { m_log.WarnFormat( "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}", @@ -10065,7 +10065,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; } - if (tii.OwnerID != AgentId) + if (tii.OwnerID != m_agentId) { m_log.WarnFormat( "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}", @@ -10153,7 +10153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleCreateInventoryFolder(Packet Pack) { CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; - if (invFolder.AgentData.SessionID != SessionId || invFolder.AgentData.AgentID != AgentId) + if (invFolder.AgentData.SessionID != m_sessionId || invFolder.AgentData.AgentID != m_agentId) return; OnCreateNewInventoryFolder?.Invoke(this, invFolder.FolderData.FolderID, @@ -10168,7 +10168,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UpdateInventoryFolderPacket invFolderx = (UpdateInventoryFolderPacket)Pack; - if (invFolderx.AgentData.SessionID != SessionId || invFolderx.AgentData.AgentID != AgentId) + if (invFolderx.AgentData.SessionID != m_sessionId || invFolderx.AgentData.AgentID != m_agentId) return; for (int i = 0; i < invFolderx.FolderData.Length; i++) { @@ -10185,7 +10185,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; MoveInventoryFolderPacket invFoldery = (MoveInventoryFolderPacket)Pack; - if (invFoldery.AgentData.SessionID != SessionId || invFoldery.AgentData.AgentID != AgentId) + if (invFoldery.AgentData.SessionID != m_sessionId || invFoldery.AgentData.AgentID != m_agentId) return; for (int i = 0; i < invFoldery.InventoryData.Length; i++) @@ -10198,7 +10198,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleCreateInventoryItem(Packet Pack) { CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; - if (createItem.AgentData.SessionID != SessionId || createItem.AgentData.AgentID != AgentId) + if (createItem.AgentData.SessionID != m_sessionId || createItem.AgentData.AgentID != m_agentId) return; OnCreateNewInventoryItem?.Invoke(this, createItem.InventoryBlock.TransactionID, @@ -10216,7 +10216,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleLinkInventoryItem(Packet Pack) { LinkInventoryItemPacket createLink = (LinkInventoryItemPacket)Pack; - if (createLink.AgentData.SessionID != SessionId || createLink.AgentData.AgentID != AgentId) + if (createLink.AgentData.SessionID != m_sessionId || createLink.AgentData.AgentID != m_agentId) return; OnLinkInventoryItem?.Invoke( @@ -10237,7 +10237,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; FetchInventoryPacket FetchInventoryx = (FetchInventoryPacket)Pack; - if (FetchInventoryx.AgentData.SessionID != SessionId || FetchInventoryx.AgentData.AgentID != AgentId) + if (FetchInventoryx.AgentData.SessionID != m_sessionId || FetchInventoryx.AgentData.AgentID != m_agentId) return; FetchInventoryPacket.InventoryDataBlock[] data = FetchInventoryx.InventoryData; @@ -10257,7 +10257,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleFetchInventoryDescendents(Packet Pack) { FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; - if (Fetch.AgentData.SessionID != SessionId || Fetch.AgentData.AgentID != AgentId) + if (Fetch.AgentData.SessionID != m_sessionId || Fetch.AgentData.AgentID != m_agentId) return; FetchInventoryDescendentsPacket.InventoryDataBlock data = Fetch.InventoryData; @@ -10269,7 +10269,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandlePurgeInventoryDescendents(Packet Pack) { PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack; - if (Purge.AgentData.SessionID != SessionId || Purge.AgentData.AgentID != AgentId) + if (Purge.AgentData.SessionID != m_sessionId || Purge.AgentData.AgentID != m_agentId) return; OnPurgeInventoryDescendents?.Invoke(this, Purge.InventoryData.FolderID); @@ -10281,7 +10281,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UpdateInventoryItemPacket inventoryItemUpdate = (UpdateInventoryItemPacket)Pack; - if (inventoryItemUpdate.AgentData.SessionID != SessionId || inventoryItemUpdate.AgentData.AgentID != AgentId) + if (inventoryItemUpdate.AgentData.SessionID != m_sessionId || inventoryItemUpdate.AgentData.AgentID != m_agentId) return; for (int i = 0; i < inventoryItemUpdate.InventoryData.Length; i++) @@ -10314,7 +10314,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; CopyInventoryItemPacket copyitem = (CopyInventoryItemPacket)Pack; - if (copyitem.AgentData.SessionID != SessionId || copyitem.AgentData.AgentID != AgentId) + if (copyitem.AgentData.SessionID != m_sessionId || copyitem.AgentData.AgentID != m_agentId) return; foreach (CopyInventoryItemPacket.InventoryDataBlock datablock in copyitem.InventoryData) @@ -10331,14 +10331,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; MoveInventoryItemPacket moveitem = (MoveInventoryItemPacket)Pack; - if (moveitem.AgentData.SessionID != SessionId || moveitem.AgentData.AgentID != AgentId) + if (moveitem.AgentData.SessionID != m_sessionId || moveitem.AgentData.AgentID != m_agentId) return; InventoryItemBase itm = null; List items = new List(); foreach (MoveInventoryItemPacket.InventoryDataBlock datablock in moveitem.InventoryData) { - itm = new InventoryItemBase(datablock.ItemID, AgentId); + itm = new InventoryItemBase(datablock.ItemID, m_agentId); itm.Folder = datablock.FolderID; itm.Name = Util.FieldToString(datablock.NewName); // weird, comes out as empty string @@ -10354,7 +10354,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; RemoveInventoryItemPacket removeItem = (RemoveInventoryItemPacket)Pack; - if (removeItem.AgentData.SessionID != SessionId || removeItem.AgentData.AgentID != AgentId) + if (removeItem.AgentData.SessionID != m_sessionId || removeItem.AgentData.AgentID != m_agentId) return; List uuids = new List(); @@ -10371,7 +10371,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; RemoveInventoryFolderPacket removeFolder = (RemoveInventoryFolderPacket)Pack; - if (removeFolder.AgentData.SessionID != SessionId || removeFolder.AgentData.AgentID != AgentId) + if (removeFolder.AgentData.SessionID != m_sessionId || removeFolder.AgentData.AgentID != m_agentId) return; List uuids = new List(); @@ -10388,7 +10388,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; RemoveInventoryObjectsPacket removeObject = (RemoveInventoryObjectsPacket)Pack; - if (removeObject.AgentData.SessionID != SessionId || removeObject.AgentData.AgentID != AgentId) + if (removeObject.AgentData.SessionID != m_sessionId || removeObject.AgentData.AgentID != m_agentId) return; List uuids = new List(); @@ -10405,7 +10405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRequestTaskInventory(Packet Pack) { RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; - if (requesttask.AgentData.SessionID != SessionId || requesttask.AgentData.AgentID != AgentId) + if (requesttask.AgentData.SessionID != m_sessionId || requesttask.AgentData.AgentID != m_agentId) return; OnRequestTaskInventory?.Invoke(this, requesttask.InventoryData.LocalID); @@ -10420,7 +10420,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (updatetask.UpdateData.Key != 0) return; // only do inventory not assets - if (updatetask.AgentData.SessionID != SessionId || updatetask.AgentData.AgentID != AgentId) + if (updatetask.AgentData.SessionID != m_sessionId || updatetask.AgentData.AgentID != m_agentId) return; TaskInventoryItem newTaskItem = new TaskInventoryItem(); @@ -10454,7 +10454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRemoveTaskInventory(Packet Pack) { RemoveTaskInventoryPacket removeTask = (RemoveTaskInventoryPacket)Pack; - if (removeTask.AgentData.SessionID != SessionId || removeTask.AgentData.AgentID != AgentId) + if (removeTask.AgentData.SessionID != m_sessionId || removeTask.AgentData.AgentID != m_agentId) return; OnRemoveTaskItem?.Invoke(this, removeTask.InventoryData.ItemID, removeTask.InventoryData.LocalID); @@ -10463,7 +10463,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleMoveTaskInventory(Packet Pack) { MoveTaskInventoryPacket moveTaskInventoryPacket = (MoveTaskInventoryPacket)Pack; - if (moveTaskInventoryPacket.AgentData.SessionID != SessionId || moveTaskInventoryPacket.AgentData.AgentID != AgentId) + if (moveTaskInventoryPacket.AgentData.SessionID != m_sessionId || moveTaskInventoryPacket.AgentData.AgentID != m_agentId) return; OnMoveTaskItem?.Invoke( @@ -10479,7 +10479,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //m_log.Debug(Pack.ToString()); RezScriptPacket rezScriptx = (RezScriptPacket)Pack; - if (rezScriptx.AgentData.SessionID != SessionId || rezScriptx.AgentData.AgentID != AgentId) + if (rezScriptx.AgentData.SessionID != m_sessionId || rezScriptx.AgentData.AgentID != m_agentId) return; InventoryItemBase item = new InventoryItemBase(); @@ -10514,7 +10514,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleMapBlockRequest(Packet Pack) { MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack; - if (MapRequest.AgentData.SessionID != SessionId || MapRequest.AgentData.AgentID != AgentId) + if (MapRequest.AgentData.SessionID != m_sessionId || MapRequest.AgentData.AgentID != m_agentId) return; OnRequestMapBlocks?.Invoke(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, @@ -10524,7 +10524,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleMapNameRequest(Packet Pack) { MapNameRequestPacket map = (MapNameRequestPacket)Pack; - if (map.AgentData.SessionID != SessionId || map.AgentData.AgentID != AgentId) + if (map.AgentData.SessionID != m_sessionId || map.AgentData.AgentID != m_agentId) return; string mapName = (map.NameData.Name.Length == 0) ? m_scene.RegionInfo.RegionName : @@ -10536,7 +10536,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleTeleportLandmarkRequest(Packet Pack) { TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack; - if (tpReq.Info.SessionID != SessionId || tpReq.Info.AgentID != AgentId) + if (tpReq.Info.SessionID != m_sessionId || tpReq.Info.AgentID != m_agentId) return; UUID lmid = tpReq.Info.LandmarkID; @@ -10576,7 +10576,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else { // Teleport home request - OnTeleportHomeRequest?.Invoke(AgentId, this); + OnTeleportHomeRequest?.Invoke(m_agentId, this); return; } @@ -10586,7 +10586,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleTeleportCancel(Packet Pack) { TeleportCancelPacket pkt = (TeleportCancelPacket) Pack; - if(pkt.Info.AgentID != AgentId || pkt.Info.SessionID != SessionId) + if(pkt.Info.AgentID != m_agentId || pkt.Info.SessionID != m_sessionId) return; OnTeleportCancel?.Invoke(this); @@ -10614,7 +10614,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; - if (tpLocReq.AgentData.SessionID != SessionId || tpLocReq.AgentData.AgentID != AgentId) + if (tpLocReq.AgentData.SessionID != m_sessionId || tpLocReq.AgentData.AgentID != m_agentId) return; // Adjust teleport location to base of a larger region if requested to teleport to a sub-region @@ -10665,7 +10665,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelInfoRequestPacket pirPack = (ParcelInfoRequestPacket)Pack; - if (pirPack.AgentData.SessionID != SessionId || pirPack.AgentData.AgentID != AgentId) + if (pirPack.AgentData.SessionID != m_sessionId || pirPack.AgentData.AgentID != m_agentId) return; OnParcelInfoRequest?.Invoke(this, pirPack.Data.ParcelID); @@ -10674,7 +10674,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelAccessListRequest(Packet Pack) { ParcelAccessListRequestPacket requestPacket = (ParcelAccessListRequestPacket)Pack; - if (requestPacket.AgentData.SessionID != SessionId || requestPacket.AgentData.AgentID != AgentId) + if (requestPacket.AgentData.SessionID != m_sessionId || requestPacket.AgentData.AgentID != m_agentId) return; OnParcelAccessListRequest?.Invoke(requestPacket.AgentData.AgentID, requestPacket.AgentData.SessionID, @@ -10688,7 +10688,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelAccessListUpdatePacket updatePacket = (ParcelAccessListUpdatePacket)Pack; - if (updatePacket.AgentData.SessionID != SessionId || updatePacket.AgentData.AgentID != AgentId) + if (updatePacket.AgentData.SessionID != m_sessionId || updatePacket.AgentData.AgentID != m_agentId) return; // viewers do send estimated number of packets and sequenceID, but don't seem reliable. @@ -10712,7 +10712,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelPropertiesRequest(Packet Pack) { ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; - if (propertiesRequest.AgentData.SessionID != SessionId || propertiesRequest.AgentData.AgentID != AgentId) + if (propertiesRequest.AgentData.SessionID != m_sessionId || propertiesRequest.AgentData.AgentID != m_agentId) return; ParcelPropertiesRequestPacket.ParcelDataBlock pdb = propertiesRequest.ParcelData; @@ -10724,7 +10724,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelDivide(Packet Pack) { ParcelDividePacket landDivide = (ParcelDividePacket)Pack; - if (landDivide.AgentData.SessionID != SessionId || landDivide.AgentData.AgentID != AgentId) + if (landDivide.AgentData.SessionID != m_sessionId || landDivide.AgentData.AgentID != m_agentId) return; OnParcelDivideRequest?.Invoke((int)Math.Round(landDivide.ParcelData.West), @@ -10736,7 +10736,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelJoin(Packet Pack) { ParcelJoinPacket landJoin = (ParcelJoinPacket)Pack; - if (landJoin.AgentData.SessionID != SessionId || landJoin.AgentData.AgentID != AgentId) + if (landJoin.AgentData.SessionID != m_sessionId || landJoin.AgentData.AgentID != m_agentId) return; OnParcelJoinRequest?.Invoke((int)Math.Round(landJoin.ParcelData.West), @@ -10751,7 +10751,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelPropertiesUpdatePacket parcelPropertiesPacket = (ParcelPropertiesUpdatePacket)Pack; - if (parcelPropertiesPacket.AgentData.SessionID != SessionId || parcelPropertiesPacket.AgentData.AgentID != AgentId) + if (parcelPropertiesPacket.AgentData.SessionID != m_sessionId || parcelPropertiesPacket.AgentData.AgentID != m_agentId) return; LandUpdateArgs args = new LandUpdateArgs(); @@ -10782,7 +10782,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack; - if (selectPacket.AgentData.SessionID != SessionId || selectPacket.AgentData.AgentID != AgentId) + if (selectPacket.AgentData.SessionID != m_sessionId || selectPacket.AgentData.AgentID != m_agentId) return; List returnIDs = new List(); @@ -10798,7 +10798,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelObjectOwnersRequest(Packet Pack) { ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; - if (reqPacket.AgentData.SessionID != SessionId || reqPacket.AgentData.AgentID != AgentId) + if (reqPacket.AgentData.SessionID != m_sessionId || reqPacket.AgentData.AgentID != m_agentId) return; OnParcelObjectOwnerRequest?.Invoke(reqPacket.ParcelData.LocalID, this); @@ -10807,7 +10807,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelGodForceOwner(Packet Pack) { ParcelGodForceOwnerPacket godForceOwnerPacket = (ParcelGodForceOwnerPacket)Pack; - if (godForceOwnerPacket.AgentData.SessionID != SessionId || godForceOwnerPacket.AgentData.AgentID != AgentId) + if (godForceOwnerPacket.AgentData.SessionID != m_sessionId || godForceOwnerPacket.AgentData.AgentID != m_agentId) return; OnParcelGodForceOwner?.Invoke(godForceOwnerPacket.Data.LocalID, godForceOwnerPacket.Data.OwnerID, this); @@ -10816,7 +10816,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelRelease(Packet Pack) { ParcelReleasePacket releasePacket = (ParcelReleasePacket)Pack; - if (releasePacket.AgentData.SessionID != SessionId || releasePacket.AgentData.AgentID != AgentId) + if (releasePacket.AgentData.SessionID != m_sessionId || releasePacket.AgentData.AgentID != m_agentId) return; OnParcelAbandonRequest?.Invoke(releasePacket.Data.LocalID, this); @@ -10825,7 +10825,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelReclaim(Packet Pack) { ParcelReclaimPacket reclaimPacket = (ParcelReclaimPacket)Pack; - if (reclaimPacket.AgentData.SessionID != SessionId || reclaimPacket.AgentData.AgentID != AgentId) + if (reclaimPacket.AgentData.SessionID != m_sessionId || reclaimPacket.AgentData.AgentID != m_agentId) return; OnParcelReclaim?.Invoke(reclaimPacket.Data.LocalID, this); @@ -10837,7 +10837,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; - if (parcelReturnObjects.AgentData.SessionID != SessionId || parcelReturnObjects.AgentData.AgentID != AgentId) + if (parcelReturnObjects.AgentData.SessionID != m_sessionId || parcelReturnObjects.AgentData.AgentID != m_agentId) return; UUID[] puserselectedOwnerIDs = new UUID[parcelReturnObjects.OwnerIDs.Length]; @@ -10854,7 +10854,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelSetOtherCleanTime(Packet Pack) { ParcelSetOtherCleanTimePacket parcelSetOtherCleanTimePacket = (ParcelSetOtherCleanTimePacket)Pack; - if (parcelSetOtherCleanTimePacket.AgentData.SessionID != SessionId || parcelSetOtherCleanTimePacket.AgentData.AgentID != AgentId) + if (parcelSetOtherCleanTimePacket.AgentData.SessionID != m_sessionId || parcelSetOtherCleanTimePacket.AgentData.AgentID != m_agentId) return; OnParcelSetOtherCleanTime?.Invoke(this, @@ -10865,7 +10865,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleLandStatRequest(Packet Pack) { LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; - if (lsrp.AgentData.SessionID != SessionId || lsrp.AgentData.AgentID != AgentId) + if (lsrp.AgentData.SessionID != m_sessionId || lsrp.AgentData.AgentID != m_agentId) return; OnLandStatRequest?.Invoke(lsrp.RequestData.ParcelLocalID, lsrp.RequestData.ReportType, lsrp.RequestData.RequestFlags, Utils.BytesToString(lsrp.RequestData.Filter), this); @@ -10874,7 +10874,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleParcelDwellRequest(Packet Pack) { ParcelDwellRequestPacket dwellrq = (ParcelDwellRequestPacket)Pack; - if (dwellrq.AgentData.SessionID != SessionId || dwellrq.AgentData.AgentID != AgentId) + if (dwellrq.AgentData.SessionID != m_sessionId || dwellrq.AgentData.AgentID != m_agentId) return; OnParcelDwellRequest?.Invoke(dwellrq.Data.LocalID, this); @@ -10888,20 +10888,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleEstateOwnerMessage(Packet Pack) { EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; - if (messagePacket.AgentData.SessionID != SessionId || messagePacket.AgentData.AgentID != AgentId) + if (messagePacket.AgentData.SessionID != m_sessionId || messagePacket.AgentData.AgentID != m_agentId) return; string method = Utils.BytesToString(messagePacket.MethodData.Method); switch (method) { case "getinfo": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { OnDetailedEstateDataRequest?.Invoke(this, messagePacket.MethodData.Invoice); } return; case "setregioninfo": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { OnSetEstateFlagsRequest?.Invoke(convertParamStringToBool(messagePacket.ParamList[0].Parameter), convertParamStringToBool(messagePacket.ParamList[1].Parameter), convertParamStringToBool(messagePacket.ParamList[2].Parameter), !convertParamStringToBool(messagePacket.ParamList[3].Parameter), @@ -10912,7 +10912,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; // case "texturebase": - // if (((Scene)m_scene).Permissions.CanIssueEstateCommand(AgentId, false)) + // if (((Scene)m_scene).Permissions.CanIssueEstateCommand(m_agentId, false)) // { // foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) // { @@ -10927,7 +10927,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // } // break; case "texturedetail": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) { @@ -10945,7 +10945,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; case "textureheights": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) { @@ -10966,7 +10966,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OnCommitEstateTerrainTextureRequest?.Invoke(this); return; case "setregionterrain": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { if (messagePacket.ParamList.Length != 9) { @@ -11003,7 +11003,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; case "restart": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) @@ -11017,7 +11017,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "estatechangecovenantid": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { foreach (EstateOwnerMessagePacket.ParamListBlock block in messagePacket.ParamList) { @@ -11027,7 +11027,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "estateaccessdelta": // Estate access delta manages the banlist and allow list too. - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { int estateAccessType = Convert.ToInt16(Utils.BytesToString(messagePacket.ParamList[1].Parameter)); @@ -11036,7 +11036,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "simulatormessage": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = new UUID(Utils.BytesToString(messagePacket.ParamList[2].Parameter)); @@ -11047,7 +11047,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "instantmessage": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { if (messagePacket.ParamList.Length < 2) return; @@ -11061,7 +11061,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (messagePacket.ParamList.Length < 5) { - SenderID = AgentId; + SenderID = m_agentId; SenderName = Utils.BytesToString(messagePacket.ParamList[0].Parameter); Message = Utils.BytesToString(messagePacket.ParamList[1].Parameter); } @@ -11076,7 +11076,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "setregiondebug": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = messagePacket.AgentData.AgentID; @@ -11088,7 +11088,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "teleporthomeuser": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = messagePacket.AgentData.AgentID; @@ -11099,7 +11099,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } return; case "teleporthomeallusers": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = messagePacket.AgentData.AgentID; @@ -11113,7 +11113,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OnLandStatRequest?.Invoke(0, 0, 0, "", this); return; case "terrain": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { if (messagePacket.ParamList.Length > 0) { @@ -11141,7 +11141,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; case "estatechangeinfo": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = messagePacket.AgentData.AgentID; @@ -11153,7 +11153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; case "telehub": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = messagePacket.AgentData.AgentID; @@ -11177,7 +11177,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; case "refreshmapvisibility": - if (m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if (m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { IWorldMapModule mapModule = Scene.RequestModuleInterface(); if (mapModule == null) @@ -11207,7 +11207,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP case "kickestate": - if(m_scene.Permissions.CanIssueEstateCommand(AgentId, false)) + if(m_scene.Permissions.CanIssueEstateCommand(m_agentId, false)) { UUID invoice = messagePacket.MethodData.Invoice; UUID SenderID = messagePacket.AgentData.AgentID; @@ -11245,7 +11245,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRequestRegionInfo(Packet Pack) { RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; - if (mPacket.SessionID != SessionId || mPacket.AgentID != AgentId) + if (mPacket.SessionID != m_sessionId || mPacket.AgentID != m_agentId) return; OnRegionInfoRequest?.Invoke(this); @@ -11254,7 +11254,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleEstateCovenantRequest(Packet Pack) { EstateCovenantRequestPacket.AgentDataBlock epack = ((EstateCovenantRequestPacket)Pack).AgentData; - if (epack.SessionID != SessionId || epack.AgentID != AgentId) + if (epack.SessionID != m_sessionId || epack.AgentID != m_agentId) return; OnEstateCovenantRequest?.Invoke(this); @@ -11268,7 +11268,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { RequestGodlikePowersPacket rglpPack = (RequestGodlikePowersPacket)Pack; RequestGodlikePowersPacket.AgentDataBlock ablock = rglpPack.AgentData; - if (ablock.SessionID != SessionId || ablock.AgentID != AgentId) + if (ablock.SessionID != m_sessionId || ablock.AgentID != m_agentId) return; RequestGodlikePowersPacket.RequestBlockBlock rblock = rglpPack.RequestBlock; @@ -11279,7 +11279,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleGodUpdateRegionInfoUpdate(Packet packet) { GodUpdateRegionInfoPacket GodUpdateRegionInfo = (GodUpdateRegionInfoPacket)packet; - if (GodUpdateRegionInfo.AgentData.SessionID != SessionId || GodUpdateRegionInfo.AgentData.AgentID != AgentId) + if (GodUpdateRegionInfo.AgentData.SessionID != m_sessionId || GodUpdateRegionInfo.AgentData.AgentID != m_agentId) return; OnGodUpdateRegionInfoUpdate?.Invoke(this, @@ -11294,7 +11294,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleSimWideDeletes(Packet packet) { SimWideDeletesPacket SimWideDeletesRequest = (SimWideDeletesPacket)packet; - if(SimWideDeletesRequest.AgentData.AgentID != AgentId || SimWideDeletesRequest.AgentData.SessionID != SessionId) + if(SimWideDeletesRequest.AgentData.AgentID != m_agentId || SimWideDeletesRequest.AgentData.SessionID != m_sessionId) return; OnSimWideDeletes?.Invoke(this, SimWideDeletesRequest.AgentData.AgentID,(int)SimWideDeletesRequest.DataBlock.Flags,SimWideDeletesRequest.DataBlock.TargetID); @@ -11304,7 +11304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GodlikeMessagePacket GodlikeMessage = (GodlikeMessagePacket)packet; - if (GodlikeMessage.AgentData.SessionID != SessionId || GodlikeMessage.AgentData.AgentID != AgentId) + if (GodlikeMessage.AgentData.SessionID != m_sessionId || GodlikeMessage.AgentData.AgentID != m_agentId) return; onGodlikeMessage?.Invoke(this, @@ -11317,7 +11317,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { StateSavePacket SaveStateMessage = (StateSavePacket)packet; - if (SaveStateMessage.AgentData.SessionID != SessionId || SaveStateMessage.AgentData.AgentID != AgentId) + if (SaveStateMessage.AgentData.SessionID != m_sessionId || SaveStateMessage.AgentData.AgentID != m_agentId) return; OnSaveState?.Invoke(this,SaveStateMessage.AgentData.AgentID); @@ -11326,7 +11326,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleGodKickUser(Packet Pack) { GodKickUserPacket gkupack = (GodKickUserPacket)Pack; - if (gkupack.UserInfo.GodSessionID != SessionId || gkupack.UserInfo.GodID != AgentId) + if (gkupack.UserInfo.GodSessionID != m_sessionId || gkupack.UserInfo.GodID != m_agentId) return; OnGodKickUser?.Invoke(gkupack.UserInfo.GodID, gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason); @@ -11338,7 +11338,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleMoneyBalanceRequest(Packet Pack) { MoneyBalanceRequestPacket moneybalancerequestpacket = (MoneyBalanceRequestPacket)Pack; - if (moneybalancerequestpacket.AgentData.SessionID != SessionId || moneybalancerequestpacket.AgentData.AgentID != AgentId) + if (moneybalancerequestpacket.AgentData.SessionID != m_sessionId || moneybalancerequestpacket.AgentData.AgentID != m_agentId) return; OnMoneyBalanceRequest?.Invoke(this, moneybalancerequestpacket.AgentData.AgentID, moneybalancerequestpacket.AgentData.SessionID, moneybalancerequestpacket.MoneyData.TransactionID); @@ -11361,13 +11361,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectSaleInfoPacket objectSaleInfoPacket = (ObjectSaleInfoPacket)Pack; - if (objectSaleInfoPacket.AgentData.SessionID != SessionId || objectSaleInfoPacket.AgentData.AgentID != AgentId) + if (objectSaleInfoPacket.AgentData.SessionID != m_sessionId || objectSaleInfoPacket.AgentData.AgentID != m_agentId) return; foreach (ObjectSaleInfoPacket.ObjectDataBlock d in objectSaleInfoPacket.ObjectData) { OnObjectSaleInfo?.Invoke(this, - AgentId, + m_agentId, SessionId, d.LocalID, d.SaleType, @@ -11381,7 +11381,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectBuyPacket objectBuyPacket = (ObjectBuyPacket)Pack; - if (objectBuyPacket.AgentData.SessionID != SessionId || objectBuyPacket.AgentData.AgentID != AgentId) + if (objectBuyPacket.AgentData.SessionID != m_sessionId || objectBuyPacket.AgentData.AgentID != m_agentId) return; foreach (ObjectBuyPacket.ObjectDataBlock d in objectBuyPacket.ObjectData) @@ -11410,7 +11410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleSetScriptRunning(Packet Pack) { SetScriptRunningPacket setScriptRunning = (SetScriptRunningPacket)Pack; - if (setScriptRunning.AgentData.SessionID != SessionId || setScriptRunning.AgentData.AgentID != AgentId) + if (setScriptRunning.AgentData.SessionID != m_sessionId || setScriptRunning.AgentData.AgentID != m_agentId) return; OnSetScriptRunning?.Invoke(this, setScriptRunning.Script.ObjectID, setScriptRunning.Script.ItemID, setScriptRunning.Script.Running); @@ -11419,7 +11419,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleScriptReset(Packet Pack) { ScriptResetPacket scriptResetPacket = (ScriptResetPacket)Pack; - if (scriptResetPacket.AgentData.SessionID != SessionId || scriptResetPacket.AgentData.AgentID != AgentId) + if (scriptResetPacket.AgentData.SessionID != m_sessionId || scriptResetPacket.AgentData.AgentID != m_agentId) return; OnScriptReset?.Invoke(this, scriptResetPacket.Script.ObjectID, scriptResetPacket.Script.ItemID); @@ -11435,7 +11435,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ActivateGesturesPacket activateGesturePacket = (ActivateGesturesPacket)Pack; - if (activateGesturePacket.AgentData.SessionID != SessionId || activateGesturePacket.AgentData.AgentID != AgentId) + if (activateGesturePacket.AgentData.SessionID != m_sessionId || activateGesturePacket.AgentData.AgentID != m_agentId) return; ActivateGesturesPacket.DataBlock[] data = activateGesturePacket.Data; @@ -11454,7 +11454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; DeactivateGesturesPacket deactivateGesturePacket = (DeactivateGesturesPacket)Pack; - if (deactivateGesturePacket.AgentData.SessionID != SessionId || deactivateGesturePacket.AgentData.AgentID != AgentId) + if (deactivateGesturePacket.AgentData.SessionID != m_sessionId || deactivateGesturePacket.AgentData.AgentID != m_agentId) return; DeactivateGesturesPacket.DataBlock[] data = deactivateGesturePacket.Data; @@ -11473,7 +11473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ObjectOwnerPacket objectOwnerPacket = (ObjectOwnerPacket)Pack; - if (objectOwnerPacket.AgentData.SessionID != SessionId || objectOwnerPacket.AgentData.AgentID != AgentId) + if (objectOwnerPacket.AgentData.SessionID != m_sessionId || objectOwnerPacket.AgentData.AgentID != m_agentId) return; List localIDs = new List(); @@ -11486,7 +11486,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleAgentFOV(Packet Pack) { AgentFOVPacket fovPacket = (AgentFOVPacket)Pack; - if(fovPacket.AgentData.AgentID != AgentId || fovPacket.AgentData.SessionID != SessionId) + if(fovPacket.AgentData.AgentID != m_agentId || fovPacket.AgentData.SessionID != m_sessionId) return; uint genCounter = fovPacket.FOVBlock.GenCounter; @@ -11508,7 +11508,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleMapItemRequest(Packet Pack) { MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack; - if (mirpk.AgentData.SessionID != SessionId || mirpk.AgentData.AgentID != AgentId) + if (mirpk.AgentData.SessionID != m_sessionId || mirpk.AgentData.AgentID != m_agentId) return; //m_log.Debug(mirpk.ToString()); @@ -11531,7 +11531,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleMuteListRequest(Packet Pack) { MuteListRequestPacket muteListRequest = (MuteListRequestPacket)Pack; - if (muteListRequest.AgentData.SessionID != SessionId || muteListRequest.AgentData.AgentID != AgentId) + if (muteListRequest.AgentData.SessionID != m_sessionId || muteListRequest.AgentData.AgentID != m_agentId) return; if (OnMuteListRequest != null) @@ -11550,7 +11550,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleUpdateMuteListEntry(Packet packet) { UpdateMuteListEntryPacket UpdateMuteListEntry = (UpdateMuteListEntryPacket)packet; - if (UpdateMuteListEntry.AgentData.SessionID != SessionId || UpdateMuteListEntry.AgentData.AgentID != AgentId) + if (UpdateMuteListEntry.AgentData.SessionID != m_sessionId || UpdateMuteListEntry.AgentData.AgentID != m_agentId) return; OnUpdateMuteListEntry?.Invoke(this, UpdateMuteListEntry.MuteData.MuteID, @@ -11562,7 +11562,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRemoveMuteListEntry(Packet packet) { RemoveMuteListEntryPacket RemoveMuteListEntry = (RemoveMuteListEntryPacket)packet; - if (RemoveMuteListEntry.AgentData.SessionID != SessionId || RemoveMuteListEntry.AgentData.AgentID != AgentId) + if (RemoveMuteListEntry.AgentData.SessionID != m_sessionId || RemoveMuteListEntry.AgentData.AgentID != m_agentId) return; OnRemoveMuteListEntry?.Invoke(this, @@ -11573,7 +11573,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleUserReport(Packet packet) { UserReportPacket UserReport = (UserReportPacket)packet; - if (UserReport.AgentData.SessionID != SessionId || UserReport.AgentData.AgentID != AgentId) + if (UserReport.AgentData.SessionID != m_sessionId || UserReport.AgentData.AgentID != m_agentId) return; OnUserReport?.Invoke(this, @@ -11603,7 +11603,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags = (ChangeInventoryItemFlagsPacket)packet; - if (ChangeInventoryItemFlags.AgentData.SessionID != SessionId || ChangeInventoryItemFlags.AgentData.AgentID != AgentId) + if (ChangeInventoryItemFlags.AgentData.SessionID != m_sessionId || ChangeInventoryItemFlags.AgentData.AgentID != m_agentId) return; foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData) @@ -11630,7 +11630,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack; - if (packet.AgentData.SessionID != SessionId || packet.AgentData.AgentID != AgentId) + if (packet.AgentData.SessionID != m_sessionId || packet.AgentData.AgentID != m_agentId) return; List items = new List(); @@ -11661,7 +11661,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleDirPlacesQuery(Packet Pack) { DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack; - if (dirPlacesQueryPacket.AgentData.SessionID != SessionId || dirPlacesQueryPacket.AgentData.AgentID != AgentId) + if (dirPlacesQueryPacket.AgentData.SessionID != m_sessionId || dirPlacesQueryPacket.AgentData.AgentID != m_agentId) return; OnDirPlacesQuery?.Invoke(this, @@ -11678,7 +11678,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleDirFindQuery(Packet Pack) { DirFindQueryPacket dirFindQueryPacket = (DirFindQueryPacket)Pack; - if (dirFindQueryPacket.AgentData.SessionID != SessionId || dirFindQueryPacket.AgentData.AgentID != AgentId) + if (dirFindQueryPacket.AgentData.SessionID != m_sessionId || dirFindQueryPacket.AgentData.AgentID != m_agentId) return; OnDirFindQuery?.Invoke(this, @@ -11692,7 +11692,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleDirLandQuery(Packet Pack) { DirLandQueryPacket dirLandQueryPacket = (DirLandQueryPacket)Pack; - if (dirLandQueryPacket.AgentData.SessionID != SessionId || dirLandQueryPacket.AgentData.AgentID != AgentId) + if (dirLandQueryPacket.AgentData.SessionID != m_sessionId || dirLandQueryPacket.AgentData.AgentID != m_agentId) return; OnDirLandQuery?.Invoke(this, @@ -11707,7 +11707,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleDirPopularQuery(Packet Pack) { DirPopularQueryPacket dirPopularQueryPacket = (DirPopularQueryPacket)Pack; - if (dirPopularQueryPacket.AgentData.SessionID != SessionId || dirPopularQueryPacket.AgentData.AgentID != AgentId) + if (dirPopularQueryPacket.AgentData.SessionID != m_sessionId || dirPopularQueryPacket.AgentData.AgentID != m_agentId) return; OnDirPopularQuery?.Invoke(this, @@ -11718,7 +11718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleDirClassifiedQuery(Packet Pack) { DirClassifiedQueryPacket dirClassifiedQueryPacket = (DirClassifiedQueryPacket)Pack; - if (dirClassifiedQueryPacket.AgentData.SessionID != SessionId || dirClassifiedQueryPacket.AgentData.AgentID != AgentId) + if (dirClassifiedQueryPacket.AgentData.SessionID != m_sessionId || dirClassifiedQueryPacket.AgentData.AgentID != m_agentId) return; OnDirClassifiedQuery?.Invoke(this, @@ -11733,7 +11733,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleEventInfoRequest(Packet Pack) { EventInfoRequestPacket eventInfoRequestPacket = (EventInfoRequestPacket)Pack; - if (eventInfoRequestPacket.AgentData.SessionID != SessionId || eventInfoRequestPacket.AgentData.AgentID != AgentId) + if (eventInfoRequestPacket.AgentData.SessionID != m_sessionId || eventInfoRequestPacket.AgentData.AgentID != m_agentId) return; OnEventInfoRequest?.Invoke(this, eventInfoRequestPacket.EventData.EventID); @@ -11746,7 +11746,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleOfferCallingCard(Packet Pack) { OfferCallingCardPacket offerCallingCardPacket = (OfferCallingCardPacket)Pack; - if (offerCallingCardPacket.AgentData.SessionID != SessionId || offerCallingCardPacket.AgentData.AgentID != AgentId) + if (offerCallingCardPacket.AgentData.SessionID != m_sessionId || offerCallingCardPacket.AgentData.AgentID != m_agentId) return; OnOfferCallingCard?.Invoke(this, @@ -11757,7 +11757,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleAcceptCallingCard(Packet Pack) { AcceptCallingCardPacket acceptCallingCardPacket = (AcceptCallingCardPacket)Pack; - if (acceptCallingCardPacket.AgentData.SessionID != SessionId || acceptCallingCardPacket.AgentData.AgentID != AgentId) + if (acceptCallingCardPacket.AgentData.SessionID != m_sessionId || acceptCallingCardPacket.AgentData.AgentID != m_agentId) return; // according to http://wiki.secondlife.com/wiki/AcceptCallingCard FolderData should @@ -11773,7 +11773,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleDeclineCallingCard(Packet Pack) { DeclineCallingCardPacket declineCallingCardPacket = (DeclineCallingCardPacket)Pack; - if (declineCallingCardPacket.AgentData.SessionID != SessionId || declineCallingCardPacket.AgentData.AgentID != AgentId) + if (declineCallingCardPacket.AgentData.SessionID != m_sessionId || declineCallingCardPacket.AgentData.AgentID != m_agentId) return; OnDeclineCallingCard?.Invoke(this, @@ -11790,7 +11790,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ActivateGroupPacket activateGroupPacket = (ActivateGroupPacket)Pack; - if (activateGroupPacket.AgentData.SessionID != SessionId || activateGroupPacket.AgentData.AgentID != AgentId) + if (activateGroupPacket.AgentData.SessionID != m_sessionId || activateGroupPacket.AgentData.AgentID != m_agentId) return; m_GroupsModule.ActivateGroup(this, activateGroupPacket.AgentData.GroupID); @@ -11799,46 +11799,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleGroupVoteHistoryRequest(Packet packet) { GroupVoteHistoryRequestPacket GroupVoteHistoryRequest = (GroupVoteHistoryRequestPacket)packet; - if (GroupVoteHistoryRequest.AgentData.SessionID != SessionId || GroupVoteHistoryRequest.AgentData.AgentID != AgentId) + if (GroupVoteHistoryRequest.AgentData.SessionID != m_sessionId || GroupVoteHistoryRequest.AgentData.AgentID != m_agentId) return; - OnGroupVoteHistoryRequest?.Invoke(this, AgentId, SessionId, GroupVoteHistoryRequest.GroupData.GroupID, GroupVoteHistoryRequest.TransactionData.TransactionID); + OnGroupVoteHistoryRequest?.Invoke(this, m_agentId, SessionId, GroupVoteHistoryRequest.GroupData.GroupID, GroupVoteHistoryRequest.TransactionData.TransactionID); } private void HandleGroupActiveProposalsRequest(Packet packet) { GroupActiveProposalsRequestPacket GroupActiveProposalsRequest = (GroupActiveProposalsRequestPacket)packet; - if (GroupActiveProposalsRequest.AgentData.SessionID != SessionId || GroupActiveProposalsRequest.AgentData.AgentID != AgentId) + if (GroupActiveProposalsRequest.AgentData.SessionID != m_sessionId || GroupActiveProposalsRequest.AgentData.AgentID != m_agentId) return; - OnGroupActiveProposalsRequest?.Invoke(this, AgentId, SessionId, GroupActiveProposalsRequest.GroupData.GroupID, GroupActiveProposalsRequest.TransactionData.TransactionID); + OnGroupActiveProposalsRequest?.Invoke(this, m_agentId, SessionId, GroupActiveProposalsRequest.GroupData.GroupID, GroupActiveProposalsRequest.TransactionData.TransactionID); } private void HandleGroupAccountDetailsRequest(Packet packet) { GroupAccountDetailsRequestPacket GroupAccountDetailsRequest = (GroupAccountDetailsRequestPacket)packet; - if (GroupAccountDetailsRequest.AgentData.SessionID != SessionId || GroupAccountDetailsRequest.AgentData.AgentID != AgentId) + if (GroupAccountDetailsRequest.AgentData.SessionID != m_sessionId || GroupAccountDetailsRequest.AgentData.AgentID != m_agentId) return; - OnGroupAccountDetailsRequest?.Invoke(this, AgentId, GroupAccountDetailsRequest.AgentData.GroupID, GroupAccountDetailsRequest.MoneyData.RequestID, SessionId); + OnGroupAccountDetailsRequest?.Invoke(this, m_agentId, GroupAccountDetailsRequest.AgentData.GroupID, GroupAccountDetailsRequest.MoneyData.RequestID, SessionId); } private void HandleGroupAccountSummaryRequest(Packet packet) { GroupAccountSummaryRequestPacket GroupAccountSummaryRequest = (GroupAccountSummaryRequestPacket)packet; - if (GroupAccountSummaryRequest.AgentData.SessionID != SessionId || GroupAccountSummaryRequest.AgentData.AgentID != AgentId) + if (GroupAccountSummaryRequest.AgentData.SessionID != m_sessionId || GroupAccountSummaryRequest.AgentData.AgentID != m_agentId) return; - OnGroupAccountSummaryRequest?.Invoke(this, AgentId,GroupAccountSummaryRequest.AgentData.GroupID); + OnGroupAccountSummaryRequest?.Invoke(this, m_agentId, GroupAccountSummaryRequest.AgentData.GroupID); } private void HandleGroupTransactionsDetailsRequest(Packet packet) { GroupAccountTransactionsRequestPacket GroupAccountTransactionsRequest = (GroupAccountTransactionsRequestPacket)packet; - if (GroupAccountTransactionsRequest.AgentData.SessionID != SessionId || GroupAccountTransactionsRequest.AgentData.AgentID != AgentId) + if (GroupAccountTransactionsRequest.AgentData.SessionID != m_sessionId || GroupAccountTransactionsRequest.AgentData.AgentID != m_agentId) return; - OnGroupAccountTransactionsRequest?.Invoke(this, AgentId,GroupAccountTransactionsRequest.AgentData.GroupID,GroupAccountTransactionsRequest.MoneyData.RequestID, SessionId); + OnGroupAccountTransactionsRequest?.Invoke(this, m_agentId, GroupAccountTransactionsRequest.AgentData.GroupID,GroupAccountTransactionsRequest.MoneyData.RequestID, SessionId); } private void HandleGroupTitlesRequest(Packet Pack) @@ -11847,14 +11847,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupTitlesRequestPacket groupTitlesRequest = (GroupTitlesRequestPacket)Pack; - if (groupTitlesRequest.AgentData.SessionID != SessionId || groupTitlesRequest.AgentData.AgentID != AgentId) + if (groupTitlesRequest.AgentData.SessionID != m_sessionId || groupTitlesRequest.AgentData.AgentID != m_agentId) return; GroupTitlesReplyPacket groupTitlesReply = (GroupTitlesReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupTitlesReply); groupTitlesReply.AgentData = new GroupTitlesReplyPacket.AgentDataBlock(); - groupTitlesReply.AgentData.AgentID = AgentId; + groupTitlesReply.AgentData.AgentID = m_agentId; groupTitlesReply.AgentData.GroupID = groupTitlesRequest.AgentData.GroupID; groupTitlesReply.AgentData.RequestID = groupTitlesRequest.AgentData.RequestID; List titles = m_GroupsModule.GroupTitlesRequest(this, @@ -11883,7 +11883,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupProfileRequestPacket groupProfileRequest = (GroupProfileRequestPacket)Pack; - if (groupProfileRequest.AgentData.SessionID != SessionId || groupProfileRequest.AgentData.AgentID != AgentId) + if (groupProfileRequest.AgentData.SessionID != m_sessionId || groupProfileRequest.AgentData.AgentID != m_agentId) return; UUID grpID = groupProfileRequest.GroupData.GroupID; @@ -11898,7 +11898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP groupProfileReply.AgentData = new GroupProfileReplyPacket.AgentDataBlock(); groupProfileReply.GroupData = new GroupProfileReplyPacket.GroupDataBlock(); - groupProfileReply.AgentData.AgentID = AgentId; + groupProfileReply.AgentData.AgentID = m_agentId; GroupProfileData d = m_GroupsModule.GroupProfileRequest(this, groupProfileRequest.GroupData.GroupID); @@ -11922,10 +11922,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP groupProfileReply.GroupData.MaturePublish = d.MaturePublish; groupProfileReply.GroupData.OwnerRole = d.OwnerRole; - if (m_scene.Permissions.IsGod(AgentId) && (!IsGroupMember(groupProfileRequest.GroupData.GroupID))) + if (m_scene.Permissions.IsGod(m_agentId) && (!IsGroupMember(groupProfileRequest.GroupData.GroupID))) { ScenePresence p; - if (m_scene.TryGetScenePresence(AgentId, out p)) + if (m_scene.TryGetScenePresence(m_agentId, out p)) { if (p.IsViewerUIGod) { @@ -11948,7 +11948,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP GroupMembersRequestPacket groupMembersRequestPacket = (GroupMembersRequestPacket)Pack; - if (groupMembersRequestPacket.AgentData.SessionID != SessionId || groupMembersRequestPacket.AgentData.AgentID != AgentId) + if (groupMembersRequestPacket.AgentData.SessionID != m_sessionId || groupMembersRequestPacket.AgentData.AgentID != m_agentId) return; List members = @@ -11968,7 +11968,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP groupMembersReply.GroupData = new GroupMembersReplyPacket.GroupDataBlock(); groupMembersReply.MemberData = new GroupMembersReplyPacket.MemberDataBlock[blockCount]; - groupMembersReply.AgentData.AgentID = AgentId; + groupMembersReply.AgentData.AgentID = m_agentId; groupMembersReply.GroupData.GroupID = groupMembersRequestPacket.GroupData.GroupID; groupMembersReply.GroupData.RequestID = groupMembersRequestPacket.GroupData.RequestID; groupMembersReply.GroupData.MemberCount = memberCount; @@ -11994,13 +11994,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupRoleDataRequestPacket groupRolesRequest = (GroupRoleDataRequestPacket)Pack; - if (groupRolesRequest.AgentData.SessionID != SessionId || groupRolesRequest.AgentData.AgentID != AgentId) + if (groupRolesRequest.AgentData.SessionID != m_sessionId || groupRolesRequest.AgentData.AgentID != m_agentId) return; GroupRoleDataReplyPacket groupRolesReply = (GroupRoleDataReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupRoleDataReply); groupRolesReply.AgentData = new GroupRoleDataReplyPacket.AgentDataBlock(); - groupRolesReply.AgentData.AgentID = AgentId; + groupRolesReply.AgentData.AgentID = m_agentId; groupRolesReply.GroupData = new GroupRoleDataReplyPacket.GroupDataBlock(); groupRolesReply.GroupData.GroupID = groupRolesRequest.GroupData.GroupID; groupRolesReply.GroupData.RequestID = groupRolesRequest.GroupData.RequestID; @@ -12031,7 +12031,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupRoleMembersRequestPacket groupRoleMembersRequest = (GroupRoleMembersRequestPacket)Pack; - if (groupRoleMembersRequest.AgentData.SessionID != SessionId || groupRoleMembersRequest.AgentData.AgentID != AgentId) + if (groupRoleMembersRequest.AgentData.SessionID != m_sessionId || groupRoleMembersRequest.AgentData.AgentID != m_agentId) return; List mappings = m_GroupsModule.GroupRoleMembersRequest(this, @@ -12047,7 +12047,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP GroupRoleMembersReplyPacket groupRoleMembersReply = (GroupRoleMembersReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupRoleMembersReply); groupRoleMembersReply.AgentData = new GroupRoleMembersReplyPacket.AgentDataBlock(); - groupRoleMembersReply.AgentData.AgentID = AgentId; + groupRoleMembersReply.AgentData.AgentID = m_agentId; groupRoleMembersReply.AgentData.GroupID = groupRoleMembersRequest.GroupData.GroupID; groupRoleMembersReply.AgentData.RequestID = groupRoleMembersRequest.GroupData.RequestID; @@ -12075,7 +12075,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; CreateGroupRequestPacket createGroupRequest = (CreateGroupRequestPacket)Pack; - if (createGroupRequest.AgentData.SessionID != SessionId || createGroupRequest.AgentData.AgentID != AgentId) + if (createGroupRequest.AgentData.SessionID != m_sessionId || createGroupRequest.AgentData.AgentID != m_agentId) return; m_GroupsModule.CreateGroup(this, @@ -12095,7 +12095,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; UpdateGroupInfoPacket updateGroupInfo = (UpdateGroupInfoPacket)Pack; - if (updateGroupInfo.AgentData.SessionID != SessionId || updateGroupInfo.AgentData.AgentID != AgentId) + if (updateGroupInfo.AgentData.SessionID != m_sessionId || updateGroupInfo.AgentData.AgentID != m_agentId) return; m_GroupsModule.UpdateGroupInfo(this, @@ -12115,7 +12115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; SetGroupAcceptNoticesPacket setGroupAcceptNotices = (SetGroupAcceptNoticesPacket)Pack; - if (setGroupAcceptNotices.AgentData.SessionID != SessionId || setGroupAcceptNotices.AgentData.AgentID != AgentId) + if (setGroupAcceptNotices.AgentData.SessionID != m_sessionId || setGroupAcceptNotices.AgentData.AgentID != m_agentId) return; m_GroupsModule.SetGroupAcceptNotices(this, @@ -12128,7 +12128,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { GroupTitleUpdatePacket groupTitleUpdate = (GroupTitleUpdatePacket)Pack; - if (groupTitleUpdate.AgentData.SessionID != SessionId || groupTitleUpdate.AgentData.AgentID != AgentId) + if (groupTitleUpdate.AgentData.SessionID != m_sessionId || groupTitleUpdate.AgentData.AgentID != m_agentId) return; m_GroupsModule.GroupTitleUpdate(this, @@ -12142,7 +12142,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; ParcelDeedToGroupPacket parcelDeedToGroup = (ParcelDeedToGroupPacket)Pack; - if (parcelDeedToGroup.AgentData.SessionID != SessionId || parcelDeedToGroup.AgentData.AgentID != AgentId) + if (parcelDeedToGroup.AgentData.SessionID != m_sessionId || parcelDeedToGroup.AgentData.AgentID != m_agentId) return; OnParcelDeedToGroup?.Invoke(parcelDeedToGroup.Data.LocalID, parcelDeedToGroup.Data.GroupID, this); @@ -12154,15 +12154,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupNoticesListRequestPacket groupNoticesListRequest = (GroupNoticesListRequestPacket)Pack; - if (groupNoticesListRequest.AgentData.SessionID != SessionId || groupNoticesListRequest.AgentData.AgentID != AgentId) + if (groupNoticesListRequest.AgentData.SessionID != m_sessionId || groupNoticesListRequest.AgentData.AgentID != m_agentId) return; - GroupNoticeData[] gn = m_GroupsModule.GroupNoticesListRequest(this, - groupNoticesListRequest.Data.GroupID); + GroupNoticeData[] gn = m_GroupsModule.GroupNoticesListRequest(this, groupNoticesListRequest.Data.GroupID); GroupNoticesListReplyPacket groupNoticesListReply = (GroupNoticesListReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupNoticesListReply); groupNoticesListReply.AgentData = new GroupNoticesListReplyPacket.AgentDataBlock(); - groupNoticesListReply.AgentData.AgentID = AgentId; + groupNoticesListReply.AgentData.AgentID = m_agentId; groupNoticesListReply.AgentData.GroupID = groupNoticesListRequest.Data.GroupID; groupNoticesListReply.Data = new GroupNoticesListReplyPacket.DataBlock[gn.Length]; @@ -12189,7 +12188,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupNoticeRequestPacket groupNoticeRequest = (GroupNoticeRequestPacket)Pack; - if (groupNoticeRequest.AgentData.SessionID != SessionId || groupNoticeRequest.AgentData.AgentID != AgentId) + if (groupNoticeRequest.AgentData.SessionID != m_sessionId || groupNoticeRequest.AgentData.AgentID != m_agentId) return; m_GroupsModule.GroupNoticeRequest(this, groupNoticeRequest.Data.GroupNoticeID); @@ -12201,7 +12200,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupRoleUpdatePacket groupRoleUpdate = (GroupRoleUpdatePacket)Pack; - if (groupRoleUpdate.AgentData.SessionID != SessionId || groupRoleUpdate.AgentData.AgentID != AgentId) + if (groupRoleUpdate.AgentData.SessionID != m_sessionId || groupRoleUpdate.AgentData.AgentID != m_agentId) return; foreach (GroupRoleUpdatePacket.RoleDataBlock d in groupRoleUpdate.RoleData) @@ -12224,7 +12223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; GroupRoleChangesPacket groupRoleChanges = (GroupRoleChangesPacket)Pack; - if (groupRoleChanges.AgentData.SessionID != SessionId || groupRoleChanges.AgentData.AgentID != AgentId) + if (groupRoleChanges.AgentData.SessionID != m_sessionId || groupRoleChanges.AgentData.AgentID != m_agentId) return; foreach (GroupRoleChangesPacket.RoleChangeBlock d in groupRoleChanges.RoleChange) @@ -12244,7 +12243,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; JoinGroupRequestPacket joinGroupRequest = (JoinGroupRequestPacket)Pack; - if (joinGroupRequest.AgentData.SessionID != SessionId || joinGroupRequest.AgentData.AgentID != AgentId) + if (joinGroupRequest.AgentData.SessionID != m_sessionId || joinGroupRequest.AgentData.AgentID != m_agentId) return; m_GroupsModule.JoinGroupRequest(this, joinGroupRequest.GroupData.GroupID); @@ -12256,7 +12255,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; LeaveGroupRequestPacket leaveGroupRequest = (LeaveGroupRequestPacket)Pack; - if (leaveGroupRequest.AgentData.SessionID != SessionId || leaveGroupRequest.AgentData.AgentID != AgentId) + if (leaveGroupRequest.AgentData.SessionID != m_sessionId || leaveGroupRequest.AgentData.AgentID != m_agentId) return; m_GroupsModule.LeaveGroupRequest(this, leaveGroupRequest.GroupData.GroupID); @@ -12268,7 +12267,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; EjectGroupMemberRequestPacket ejectGroupMemberRequest = (EjectGroupMemberRequestPacket)Pack; - if (ejectGroupMemberRequest.AgentData.SessionID != SessionId || ejectGroupMemberRequest.AgentData.AgentID != AgentId) + if (ejectGroupMemberRequest.AgentData.SessionID != m_sessionId || ejectGroupMemberRequest.AgentData.AgentID != m_agentId) return; foreach (EjectGroupMemberRequestPacket.EjectDataBlock e in ejectGroupMemberRequest.EjectData) @@ -12285,7 +12284,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; InviteGroupRequestPacket inviteGroupRequest = (InviteGroupRequestPacket)Pack; - if (inviteGroupRequest.AgentData.SessionID != SessionId || inviteGroupRequest.AgentData.AgentID != AgentId) + if (inviteGroupRequest.AgentData.SessionID != m_sessionId || inviteGroupRequest.AgentData.AgentID != m_agentId) return; foreach (InviteGroupRequestPacket.InviteDataBlock b in inviteGroupRequest.InviteData) @@ -12305,7 +12304,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return; StartLurePacket startLureRequest = (StartLurePacket)Pack; - if (startLureRequest.AgentData.SessionID != SessionId || startLureRequest.AgentData.AgentID != AgentId) + if (startLureRequest.AgentData.SessionID != m_sessionId || startLureRequest.AgentData.AgentID != m_agentId) return; for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++) @@ -12321,7 +12320,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleTeleportLureRequest(Packet Pack) { TeleportLureRequestPacket teleportLureRequest = (TeleportLureRequestPacket)Pack; - if (teleportLureRequest.Info.SessionID != SessionId || teleportLureRequest.Info.AgentID != AgentId) + if (teleportLureRequest.Info.SessionID != m_sessionId || teleportLureRequest.Info.AgentID != m_agentId) return; OnTeleportLureRequest?.Invoke( @@ -12333,7 +12332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleClassifiedInfoRequest(Packet Pack) { ClassifiedInfoRequestPacket classifiedInfoRequest = (ClassifiedInfoRequestPacket)Pack; - if (classifiedInfoRequest.AgentData.SessionID != SessionId || classifiedInfoRequest.AgentData.AgentID != AgentId) + if (classifiedInfoRequest.AgentData.SessionID != m_sessionId || classifiedInfoRequest.AgentData.AgentID != m_agentId) return; OnClassifiedInfoRequest?.Invoke( @@ -12344,7 +12343,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleClassifiedInfoUpdate(Packet Pack) { ClassifiedInfoUpdatePacket classifiedInfoUpdate = (ClassifiedInfoUpdatePacket)Pack; - if (classifiedInfoUpdate.AgentData.SessionID != SessionId || classifiedInfoUpdate.AgentData.AgentID != AgentId) + if (classifiedInfoUpdate.AgentData.SessionID != m_sessionId || classifiedInfoUpdate.AgentData.AgentID != m_agentId) return; // fix classifiedFlags maturity @@ -12372,7 +12371,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleClassifiedDelete(Packet Pack) { ClassifiedDeletePacket classifiedDelete = (ClassifiedDeletePacket)Pack; - if (classifiedDelete.AgentData.SessionID != SessionId || classifiedDelete.AgentData.AgentID != AgentId) + if (classifiedDelete.AgentData.SessionID != m_sessionId || classifiedDelete.AgentData.AgentID != m_agentId) return; OnClassifiedDelete?.Invoke( @@ -12383,7 +12382,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleClassifiedGodDelete(Packet Pack) { ClassifiedGodDeletePacket classifiedGodDelete = (ClassifiedGodDeletePacket)Pack; - if (classifiedGodDelete.AgentData.SessionID != SessionId || classifiedGodDelete.AgentData.AgentID != AgentId) + if (classifiedGodDelete.AgentData.SessionID != m_sessionId || classifiedGodDelete.AgentData.AgentID != m_agentId) return; OnClassifiedGodDelete?.Invoke( @@ -12395,7 +12394,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleEventGodDelete(Packet Pack) { EventGodDeletePacket eventGodDelete = (EventGodDeletePacket)Pack; - if (eventGodDelete.AgentData.SessionID != SessionId || eventGodDelete.AgentData.AgentID != AgentId) + if (eventGodDelete.AgentData.SessionID != m_sessionId || eventGodDelete.AgentData.AgentID != m_agentId) return; OnEventGodDelete?.Invoke( @@ -12411,7 +12410,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleEventNotificationAddRequest(Packet Pack) { EventNotificationAddRequestPacket eventNotificationAdd = (EventNotificationAddRequestPacket)Pack; - if (eventNotificationAdd.AgentData.SessionID != SessionId || eventNotificationAdd.AgentData.AgentID != AgentId) + if (eventNotificationAdd.AgentData.SessionID != m_sessionId || eventNotificationAdd.AgentData.AgentID != m_agentId) return; OnEventNotificationAddRequest?.Invoke(eventNotificationAdd.EventData.EventID, this); @@ -12420,7 +12419,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleEventNotificationRemoveRequest(Packet Pack) { EventNotificationRemoveRequestPacket eventNotificationRemove = (EventNotificationRemoveRequestPacket)Pack; - if (eventNotificationRemove.AgentData.SessionID != SessionId || eventNotificationRemove.AgentData.AgentID != AgentId) + if (eventNotificationRemove.AgentData.SessionID != m_sessionId || eventNotificationRemove.AgentData.AgentID != m_agentId) return; OnEventNotificationRemoveRequest?.Invoke(eventNotificationRemove.EventData.EventID, this); @@ -12429,7 +12428,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRetrieveInstantMessages(Packet Pack) { RetrieveInstantMessagesPacket rimpInstantMessagePack = (RetrieveInstantMessagesPacket)Pack; - if (rimpInstantMessagePack.AgentData.SessionID != SessionId || rimpInstantMessagePack.AgentData.AgentID != AgentId) + if (rimpInstantMessagePack.AgentData.SessionID != m_sessionId || rimpInstantMessagePack.AgentData.AgentID != m_agentId) return; OnRetrieveInstantMessages?.Invoke(this); @@ -12438,7 +12437,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandlePickDelete(Packet Pack) { PickDeletePacket pickDelete = (PickDeletePacket)Pack; - if (pickDelete.AgentData.SessionID != SessionId || pickDelete.AgentData.AgentID != AgentId) + if (pickDelete.AgentData.SessionID != m_sessionId || pickDelete.AgentData.AgentID != m_agentId) return; OnPickDelete?.Invoke(this, pickDelete.Data.PickID); @@ -12447,7 +12446,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandlePickGodDelete(Packet Pack) { PickGodDeletePacket pickGodDelete = (PickGodDeletePacket)Pack; - if (pickGodDelete.AgentData.SessionID != SessionId || pickGodDelete.AgentData.AgentID != AgentId) + if (pickGodDelete.AgentData.SessionID != m_sessionId || pickGodDelete.AgentData.AgentID != m_agentId) return; OnPickGodDelete?.Invoke(this, @@ -12459,7 +12458,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandlePickInfoUpdate(Packet Pack) { PickInfoUpdatePacket pickInfoUpdate = (PickInfoUpdatePacket)Pack; - if (pickInfoUpdate.AgentData.SessionID != SessionId || pickInfoUpdate.AgentData.AgentID != AgentId) + if (pickInfoUpdate.AgentData.SessionID != m_sessionId || pickInfoUpdate.AgentData.AgentID != m_agentId) return; OnPickInfoUpdate?.Invoke(this, @@ -12476,7 +12475,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleAvatarNotesUpdate(Packet Pack) { AvatarNotesUpdatePacket avatarNotesUpdate = (AvatarNotesUpdatePacket)Pack; - if (avatarNotesUpdate.AgentData.SessionID != SessionId || avatarNotesUpdate.AgentData.AgentID != AgentId) + if (avatarNotesUpdate.AgentData.SessionID != m_sessionId || avatarNotesUpdate.AgentData.AgentID != m_agentId) return; OnAvatarNotesUpdate?.Invoke(this, @@ -12487,7 +12486,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleAvatarInterestsUpdate(Packet Pack) { AvatarInterestsUpdatePacket avatarInterestUpdate = (AvatarInterestsUpdatePacket)Pack; - if (avatarInterestUpdate.AgentData.SessionID != SessionId || avatarInterestUpdate.AgentData.AgentID != AgentId) + if (avatarInterestUpdate.AgentData.SessionID != m_sessionId || avatarInterestUpdate.AgentData.AgentID != m_agentId) return; OnAvatarInterestUpdate?.Invoke(this, @@ -12501,7 +12500,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleGrantUserRights(Packet Pack) { GrantUserRightsPacket GrantUserRights = (GrantUserRightsPacket)Pack; - if (GrantUserRights.AgentData.SessionID != SessionId || GrantUserRights.AgentData.AgentID != AgentId) + if (GrantUserRights.AgentData.SessionID != m_sessionId || GrantUserRights.AgentData.AgentID != m_agentId) return; OnGrantUserRights?.Invoke(this, @@ -12515,7 +12514,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandleRevokePermissions(Packet Pack) { RevokePermissionsPacket pkt = (RevokePermissionsPacket)Pack; - if (pkt.AgentData.SessionID != SessionId || pkt .AgentData.AgentID != AgentId) + if (pkt.AgentData.SessionID != m_sessionId || pkt .AgentData.AgentID != m_agentId) return; uint thisSeq = pkt.Header.Sequence; @@ -12545,7 +12544,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private void HandlePlacesQuery(Packet Pack) { PlacesQueryPacket placesQueryPacket = (PlacesQueryPacket)Pack; - if (placesQueryPacket.AgentData.SessionID != SessionId || placesQueryPacket.AgentData.AgentID != AgentId) + if (placesQueryPacket.AgentData.SessionID != m_sessionId || placesQueryPacket.AgentData.AgentID != m_agentId) return; OnPlacesQuery?.Invoke(placesQueryPacket.AgentData.QueryID, @@ -12585,7 +12584,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { if (packet.Type == PacketType.LogoutRequest) { - if (((LogoutRequestPacket)packet).AgentData.SessionID != SessionId) + if (((LogoutRequestPacket)packet).AgentData.SessionID != m_sessionId) return; } Logout(this); @@ -12618,11 +12617,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); - if (cachedtex.AgentData.SessionID != SessionId || cachedtex.AgentData.AgentID != AgentId) + if (cachedtex.AgentData.SessionID != m_sessionId || cachedtex.AgentData.AgentID != m_agentId) return; // TODO: don't create new blocks if recycling an old packet - cachedresp.AgentData.AgentID = AgentId; + cachedresp.AgentData.AgentID = m_agentId; cachedresp.AgentData.SessionID = m_sessionId; cachedresp.AgentData.SerialNum = cachedtex.AgentData.SerialNum; cachedresp.WearableData = @@ -12634,7 +12633,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP WearableCacheItem[] cacheItems = null; - ScenePresence p = m_scene.GetScenePresence(AgentId); + ScenePresence p = m_scene.GetScenePresence(m_agentId); if (p != null && p.Appearance != null) { @@ -12719,7 +12718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; - if (multipleupdate.AgentData.SessionID != SessionId || multipleupdate.AgentData.AgentID != AgentId) + if (multipleupdate.AgentData.SessionID != m_sessionId || multipleupdate.AgentData.AgentID != m_agentId) return; // m_log.DebugFormat( @@ -12893,7 +12892,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area) MapLayerReplyPacket mapReply = (MapLayerReplyPacket)PacketPool.Instance.GetPacket(PacketType.MapLayerReply); // TODO: don't create new blocks if recycling an old packet - mapReply.AgentData.AgentID = AgentId; + mapReply.AgentData.AgentID = m_agentId; mapReply.AgentData.Flags = 0; mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1]; mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock(); @@ -12911,7 +12910,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /* IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY); MapBlockReplyPacket mbReply = new MapBlockReplyPacket(); - mbReply.AgentData.AgentId = AgentId; + mbReply.AgentData.AgentId = m_agentId; int len; if (simMapProfiles == null) len = 0; @@ -13314,7 +13313,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (m_GroupsModule != null) { GroupMembershipData[] GroupMembership = - m_GroupsModule.GetMembershipData(AgentId); + m_GroupsModule.GetMembershipData(m_agentId); m_groupPowers.Clear(); @@ -13326,7 +13325,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - activeMembership = m_GroupsModule.GetActiveMembershipData(AgentId); + activeMembership = m_GroupsModule.GetActiveMembershipData(m_agentId); if(activeMembership != null) { if(!m_groupPowers.ContainsKey(activeMembership.GroupID)) @@ -13449,7 +13448,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP IInventoryAccessModule inventoryAccessModule = Scene.RequestModuleInterface(); string assetServerURL = string.Empty; - if (inventoryAccessModule.IsForeignUser(AgentId, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL)) + if (inventoryAccessModule.IsForeignUser(m_agentId, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL)) { if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) assetServerURL = assetServerURL + "/"; @@ -13554,7 +13553,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP AvatarInterestsReplyPacket packet = (AvatarInterestsReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarInterestsReply); packet.AgentData = new AvatarInterestsReplyPacket.AgentDataBlock(); - packet.AgentData.AgentID = AgentId; + packet.AgentData.AgentID = m_agentId; packet.AgentData.AvatarID = avatarID; packet.PropertiesData = new AvatarInterestsReplyPacket.PropertiesDataBlock(); @@ -13661,7 +13660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { reply = (PlacesReplyPacket)PacketPool.Instance.GetPacket(PacketType.PlacesReply); reply.AgentData = new PlacesReplyPacket.AgentDataBlock(); - reply.AgentData.AgentID = AgentId; + reply.AgentData.AgentID = m_agentId; reply.AgentData.QueryID = queryID; reply.TransactionData = new PlacesReplyPacket.TransactionDataBlock(); @@ -13690,7 +13689,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP osUTF8 sb = eq.StartEvent("RemoveInventoryItem"); LLSDxmlEncode2.AddArrayAndMap("AgentData", sb); - LLSDxmlEncode2.AddElem("AgentID", AgentId, sb); + LLSDxmlEncode2.AddElem("AgentID", m_agentId, sb); LLSDxmlEncode2.AddElem("SessionID", SessionId, sb); LLSDxmlEncode2.AddEndMapAndArray(sb); @@ -13703,7 +13702,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } LLSDxmlEncode2.AddEndArray(sb); - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } public void SendRemoveInventoryFolders(UUID[] folders) @@ -13719,7 +13718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP osUTF8 sb = eq.StartEvent("RemoveInventoryFolder"); LLSDxmlEncode2.AddArrayAndMap("AgentData", sb); - LLSDxmlEncode2.AddElem("AgentID", AgentId, sb); + LLSDxmlEncode2.AddElem("AgentID", m_agentId, sb); LLSDxmlEncode2.AddElem("SessionID", SessionId, sb); LLSDxmlEncode2.AddEndMapAndArray(sb); @@ -13732,7 +13731,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } LLSDxmlEncode2.AddEndArray(sb); - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } public void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items) @@ -13748,7 +13747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP osUTF8 sb = eq.StartEvent("BulkUpdateInventory"); LLSDxmlEncode2.AddArrayAndMap("AgentData", sb); - LLSDxmlEncode2.AddElem("AgentID", AgentId, sb); + LLSDxmlEncode2.AddElem("AgentID", m_agentId, sb); LLSDxmlEncode2.AddElem("TransactionID", UUID.Random(), sb); LLSDxmlEncode2.AddEndMapAndArray(sb); @@ -13816,7 +13815,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP LLSDxmlEncode2.AddEndArray(sb); } - eq.Enqueue(eq.EndEventToBytes(sb), AgentId); + eq.Enqueue(eq.EndEventToBytes(sb), m_agentId); } private HashSet m_outPacketsToDrop;