From 230835dbaab80bc672b5cbd9f12e09930ed516e1 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 15 Oct 2008 17:06:47 +0000 Subject: * refactor: Remove OutPacket from the IClientAPI * I believe this is reasonable since code outside the Linden client stack shouldn't be aware of the packet format being used * I would love to have made the method protected, but the LoadBalancerPlugin is still calling it and resolving that would require more work --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 251ba78..198d660 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -2921,7 +2921,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket(packet, ThrottleOutPacketType.Task); } - public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) + public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) { ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties); // TODO: don't create new blocks if recycling an old packet @@ -2999,7 +2999,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP updatePacket.ParcelData.UserLocation = landData.UserLocation; updatePacket.ParcelData.UserLookAt = landData.UserLookAt; updatePacket.Header.Zerocoded = true; - remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); + + OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); } public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) @@ -3945,14 +3946,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// - /// The dreaded OutPacket. This should only be called from within - /// the ClientStack itself right now - /// This is the entry point for simulator packets to go out to - /// the client. + /// This is the starting point for sending a simulator packet out to the client. + /// + /// Please do not call this from outside the LindenUDP client stack. /// /// /// Corresponds to the type of data that is going out. Enum - public virtual void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType) + public void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType) { m_PacketHandler.OutPacket(NewPack, throttlePacketType); } -- cgit v1.1