aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-15 17:06:47 +0000
committerJustin Clarke Casey2008-10-15 17:06:47 +0000
commit230835dbaab80bc672b5cbd9f12e09930ed516e1 (patch)
treeb0d95eaf66375b9ddc06c8a66d1e673188af036a /OpenSim/Region/ClientStack/LindenUDP
parent* refactor: move viewer effect packet into LLClientView (diff)
downloadopensim-SC_OLD-230835dbaab80bc672b5cbd9f12e09930ed516e1.zip
opensim-SC_OLD-230835dbaab80bc672b5cbd9f12e09930ed516e1.tar.gz
opensim-SC_OLD-230835dbaab80bc672b5cbd9f12e09930ed516e1.tar.bz2
opensim-SC_OLD-230835dbaab80bc672b5cbd9f12e09930ed516e1.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
1 files changed, 7 insertions, 7 deletions
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
2921 this.OutPacket(packet, ThrottleOutPacketType.Task); 2921 this.OutPacket(packet, ThrottleOutPacketType.Task);
2922 } 2922 }
2923 2923
2924 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) 2924 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
2925 { 2925 {
2926 ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties); 2926 ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
2927 // TODO: don't create new blocks if recycling an old packet 2927 // TODO: don't create new blocks if recycling an old packet
@@ -2999,7 +2999,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2999 updatePacket.ParcelData.UserLocation = landData.UserLocation; 2999 updatePacket.ParcelData.UserLocation = landData.UserLocation;
3000 updatePacket.ParcelData.UserLookAt = landData.UserLookAt; 3000 updatePacket.ParcelData.UserLookAt = landData.UserLookAt;
3001 updatePacket.Header.Zerocoded = true; 3001 updatePacket.Header.Zerocoded = true;
3002 remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); 3002
3003 OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task);
3003 } 3004 }
3004 3005
3005 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) 3006 public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
@@ -3945,14 +3946,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3945 3946
3946 3947
3947 /// <summary> 3948 /// <summary>
3948 /// The dreaded OutPacket. This should only be called from within 3949 /// This is the starting point for sending a simulator packet out to the client.
3949 /// the ClientStack itself right now 3950 ///
3950 /// This is the entry point for simulator packets to go out to 3951 /// Please do not call this from outside the LindenUDP client stack.
3951 /// the client.
3952 /// </summary> 3952 /// </summary>
3953 /// <param name="NewPack"></param> 3953 /// <param name="NewPack"></param>
3954 /// <param name="throttlePacketType">Corresponds to the type of data that is going out. Enum</param> 3954 /// <param name="throttlePacketType">Corresponds to the type of data that is going out. Enum</param>
3955 public virtual void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType) 3955 public void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType)
3956 { 3956 {
3957 m_PacketHandler.OutPacket(NewPack, throttlePacketType); 3957 m_PacketHandler.OutPacket(NewPack, throttlePacketType);
3958 } 3958 }