aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2010-09-05 14:16:42 +0200
committerMelanie2010-09-05 14:28:33 +0100
commit6a0a878f7c268c6f248588895e232e3d14eb6eb3 (patch)
tree19cf0fcd48035f34dee80fd07ce95f39bf486d99 /OpenSim/Region/ClientStack
parentLogout the presence if client IP verification fails. (diff)
downloadopensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.zip
opensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.gz
opensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.bz2
opensim-SC_OLD-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.xz
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3d4269f..9cdc80b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2668,6 +2668,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2668 2668
2669 public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) 2669 public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
2670 { 2670 {
2671 float dwell = 0.0f;
2672 IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
2673 if (dwellModule != null)
2674 dwell = dwellModule.GetDwell(land.GlobalID);
2671 ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); 2675 ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply);
2672 reply.AgentData.AgentID = m_agentId; 2676 reply.AgentData.AgentID = m_agentId;
2673 reply.Data.ParcelID = parcelID; 2677 reply.Data.ParcelID = parcelID;
@@ -2692,7 +2696,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2692 reply.Data.GlobalZ = pos.Z; 2696 reply.Data.GlobalZ = pos.Z;
2693 reply.Data.SimName = Utils.StringToBytes(info.RegionName); 2697 reply.Data.SimName = Utils.StringToBytes(info.RegionName);
2694 reply.Data.SnapshotID = land.SnapshotID; 2698 reply.Data.SnapshotID = land.SnapshotID;
2695 reply.Data.Dwell = land.Dwell; 2699 reply.Data.Dwell = dwell;
2696 reply.Data.SalePrice = land.SalePrice; 2700 reply.Data.SalePrice = land.SalePrice;
2697 reply.Data.AuctionID = (int)land.AuctionID; 2701 reply.Data.AuctionID = (int)land.AuctionID;
2698 2702