diff options
author | Justin Clarke Casey | 2008-10-15 17:06:47 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-15 17:06:47 +0000 |
commit | 230835dbaab80bc672b5cbd9f12e09930ed516e1 (patch) | |
tree | b0d95eaf66375b9ddc06c8a66d1e673188af036a /OpenSim/Region/Environment/Modules | |
parent | * refactor: move viewer effect packet into LLClientView (diff) | |
download | opensim-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/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 14f43b4..097e55f 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
172 | // regionFlags |= (uint)RegionFlags.AllowLandmark; | 172 | // regionFlags |= (uint)RegionFlags.AllowLandmark; |
173 | // if (landData.OwnerID == remote_client.AgentId) | 173 | // if (landData.OwnerID == remote_client.AgentId) |
174 | // regionFlags |= (uint)RegionFlags.AllowSetHome; | 174 | // regionFlags |= (uint)RegionFlags.AllowSetHome; |
175 | remote_client.SendLandProperties(remote_client, sequence_id, | 175 | remote_client.SendLandProperties(sequence_id, |
176 | snap_selection, request_result, landData, | 176 | snap_selection, request_result, landData, |
177 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, | 177 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, |
178 | getParcelMaxPrimCount(this), | 178 | getParcelMaxPrimCount(this), |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 86f3288..e5e6a79 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -414,10 +414,6 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
414 | get { return 1; } | 414 | get { return 1; } |
415 | } | 415 | } |
416 | 416 | ||
417 | public virtual void OutPacket(Packet newPack, ThrottleOutPacketType packType) | ||
418 | { | ||
419 | } | ||
420 | |||
421 | public virtual void SendWearables(AvatarWearable[] wearables, int serial) | 417 | public virtual void SendWearables(AvatarWearable[] wearables, int serial) |
422 | { | 418 | { |
423 | } | 419 | } |
@@ -840,7 +836,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
840 | { | 836 | { |
841 | } | 837 | } |
842 | 838 | ||
843 | 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) | 839 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
844 | { | 840 | { |
845 | } | 841 | } |
846 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 842 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) |