diff options
author | Melanie Thielker | 2010-09-05 14:16:42 +0200 |
---|---|---|
committer | Melanie | 2010-09-05 14:28:33 +0100 |
commit | 6a0a878f7c268c6f248588895e232e3d14eb6eb3 (patch) | |
tree | 19cf0fcd48035f34dee80fd07ce95f39bf486d99 /OpenSim/Region/DataSnapshot/LandSnapshot.cs | |
parent | Logout the presence if client IP verification fails. (diff) | |
download | opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.zip opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.gz opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.bz2 opensim-SC-6a0a878f7c268c6f248588895e232e3d14eb6eb3.tar.xz |
Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
Diffstat (limited to 'OpenSim/Region/DataSnapshot/LandSnapshot.cs')
-rw-r--r-- | OpenSim/Region/DataSnapshot/LandSnapshot.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 64d29f2..b8c90cd 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs | |||
@@ -123,6 +123,8 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
123 | ILandChannel landChannel = m_scene.LandChannel; | 123 | ILandChannel landChannel = m_scene.LandChannel; |
124 | List<ILandObject> parcels = landChannel.AllParcels(); | 124 | List<ILandObject> parcels = landChannel.AllParcels(); |
125 | 125 | ||
126 | IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); | ||
127 | |||
126 | XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", ""); | 128 | XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", ""); |
127 | if (parcels != null) | 129 | if (parcels != null) |
128 | { | 130 | { |
@@ -208,7 +210,10 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
208 | xmlparcel.AppendChild(infouuid); | 210 | xmlparcel.AppendChild(infouuid); |
209 | 211 | ||
210 | XmlNode dwell = nodeFactory.CreateNode(XmlNodeType.Element, "dwell", ""); | 212 | XmlNode dwell = nodeFactory.CreateNode(XmlNodeType.Element, "dwell", ""); |
211 | dwell.InnerText = parcel.Dwell.ToString(); | 213 | if (dwellModule != null) |
214 | dwell.InnerText = dwellModule.GetDwell(parcel.GlobalID).ToString(); | ||
215 | else | ||
216 | dwell.InnerText = "0"; | ||
212 | xmlparcel.AppendChild(dwell); | 217 | xmlparcel.AppendChild(dwell); |
213 | 218 | ||
214 | //TODO: figure how to figure out teleport system landData.landingType | 219 | //TODO: figure how to figure out teleport system landData.landingType |