aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorUbitUmarov2017-05-14 07:52:50 +0100
committerUbitUmarov2017-05-14 07:52:50 +0100
commiteea247fcc5f29c767dc1e3b7f9a5616843256e8d (patch)
treeec27d1c12890efa30a2a04edb32c4190e265ba54 /OpenSim/Region/ClientStack
parentMerge branch 'master' into httptests (diff)
parentclear land object on delete (diff)
downloadopensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.zip
opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.gz
opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.bz2
opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5b3c3e6..298c933 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3111,10 +3111,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3111 3111
3112 public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) 3112 public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
3113 { 3113 {
3114 float dwell = 0.0f;
3115 IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
3116 if (dwellModule != null)
3117 dwell = dwellModule.GetDwell(land.GlobalID);
3118 ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); 3114 ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply);
3119 reply.AgentData.AgentID = m_agentId; 3115 reply.AgentData.AgentID = m_agentId;
3120 reply.Data.ParcelID = parcelID; 3116 reply.Data.ParcelID = parcelID;
@@ -3141,7 +3137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3141 reply.Data.GlobalZ = pos.Z; 3137 reply.Data.GlobalZ = pos.Z;
3142 reply.Data.SimName = Utils.StringToBytes(info.RegionName); 3138 reply.Data.SimName = Utils.StringToBytes(info.RegionName);
3143 reply.Data.SnapshotID = land.SnapshotID; 3139 reply.Data.SnapshotID = land.SnapshotID;
3144 reply.Data.Dwell = dwell; 3140 reply.Data.Dwell = land.Dwell;
3145 reply.Data.SalePrice = land.SalePrice; 3141 reply.Data.SalePrice = land.SalePrice;
3146 reply.Data.AuctionID = (int)land.AuctionID; 3142 reply.Data.AuctionID = (int)land.AuctionID;
3147 3143