diff options
author | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
commit | e5936071711e35f9edf44d8393b8ad28ef4023db (patch) | |
tree | 72677e380cfcea4921eb910a93a1b985a4a4d6d1 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.zip opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.gz opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.bz2 opensim-SC-e5936071711e35f9edf44d8393b8ad28ef4023db.tar.xz |
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a1cd30a..3dea40c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2687,6 +2687,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2687 | 2687 | ||
2688 | public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) | 2688 | public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) |
2689 | { | 2689 | { |
2690 | float dwell = 0.0f; | ||
2691 | IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); | ||
2692 | if (dwellModule != null) | ||
2693 | dwell = dwellModule.GetDwell(land.GlobalID); | ||
2690 | ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); | 2694 | ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); |
2691 | reply.AgentData.AgentID = m_agentId; | 2695 | reply.AgentData.AgentID = m_agentId; |
2692 | reply.Data.ParcelID = parcelID; | 2696 | reply.Data.ParcelID = parcelID; |
@@ -2711,7 +2715,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2711 | reply.Data.GlobalZ = pos.Z; | 2715 | reply.Data.GlobalZ = pos.Z; |
2712 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); | 2716 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); |
2713 | reply.Data.SnapshotID = land.SnapshotID; | 2717 | reply.Data.SnapshotID = land.SnapshotID; |
2714 | reply.Data.Dwell = land.Dwell; | 2718 | reply.Data.Dwell = dwell; |
2715 | reply.Data.SalePrice = land.SalePrice; | 2719 | reply.Data.SalePrice = land.SalePrice; |
2716 | reply.Data.AuctionID = (int)land.AuctionID; | 2720 | reply.Data.AuctionID = (int)land.AuctionID; |
2717 | 2721 | ||