diff options
author | PixelTomsen | 2012-10-19 21:02:54 +0200 |
---|---|---|
committer | BlueWall | 2012-10-20 05:06:46 -0400 |
commit | d7fa4cacb3227cb432a13d4f27076e408e8c114f (patch) | |
tree | 19e4f83c513b8e2dd6075efcb202cccf4a2d66d3 /OpenSim/Region/CoreModules/World/Land | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-d7fa4cacb3227cb432a13d4f27076e408e8c114f.zip opensim-SC_OLD-d7fa4cacb3227cb432a13d4f27076e408e8c114f.tar.gz opensim-SC_OLD-d7fa4cacb3227cb432a13d4f27076e408e8c114f.tar.bz2 opensim-SC_OLD-d7fa4cacb3227cb432a13d4f27076e408e8c114f.tar.xz |
Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (implementation of dwell-value in LandData + eventhandler, return always 0); source-formatting of LandData
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 8b7406d..95edf62 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -207,6 +207,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
207 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; | 207 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; |
208 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; | 208 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; |
209 | client.OnPreAgentUpdate += ClientOnPreAgentUpdate; | 209 | client.OnPreAgentUpdate += ClientOnPreAgentUpdate; |
210 | client.OnParcelDwellRequest += ClientOnParcelDwellRequest; | ||
210 | 211 | ||
211 | EntityBase presenceEntity; | 212 | EntityBase presenceEntity; |
212 | if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) | 213 | if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) |
@@ -798,6 +799,17 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
798 | } | 799 | } |
799 | } | 800 | } |
800 | 801 | ||
802 | private void ClientOnParcelDwellRequest(int localID, IClientAPI client) | ||
803 | { | ||
804 | ILandObject parcel = null; | ||
805 | lock (m_landList) | ||
806 | { | ||
807 | if (!m_landList.TryGetValue(localID, out parcel)) | ||
808 | return; | ||
809 | } | ||
810 | client.SendParcelDwellReply(localID, parcel.LandData.GlobalID, parcel.LandData.Dwell); | ||
811 | } | ||
812 | |||
801 | #endregion | 813 | #endregion |
802 | 814 | ||
803 | #region Parcel Modification | 815 | #region Parcel Modification |