ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: Remove OutPacket from the IClientAPI

Browse Source 
* 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
This commit is contained in:
Justin Clarke Casey
2008-10-15 17:06:47 +00:00
parent 87e85489f3
commit 230835dbaa
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -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<UUID> avatars, uint accessFlag, int localLandID)
@@ -3945,14 +3946,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary>
/// 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.
/// </summary>
/// <param name="NewPack"></param>
/// <param name="throttlePacketType">Corresponds to the type of data that is going out. Enum</param>
public virtual void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType)
public void OutPacket(Packet NewPack, ThrottleOutPacketType throttlePacketType)
{
m_PacketHandler.OutPacket(NewPack, throttlePacketType);
}