aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Serialization/External
diff options
context:
space:
mode:
authorMelanie Thielker2010-09-05 14:16:42 +0200
committerMelanie2010-09-05 14:28:33 +0100
commit6a0a878f7c268c6f248588895e232e3d14eb6eb3 (patch)
tree19cf0fcd48035f34dee80fd07ce95f39bf486d99 /OpenSim/Framework/Serialization/External
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/Framework/Serialization/External')
-rw-r--r--OpenSim/Framework/Serialization/External/LandDataSerializer.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index ff0afc8..fc0387b 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -118,7 +118,8 @@ namespace OpenSim.Framework.Serialization.External
118 landData.SnapshotID = UUID.Parse( xtr.ReadElementString("SnapshotID")); 118 landData.SnapshotID = UUID.Parse( xtr.ReadElementString("SnapshotID"));
119 landData.UserLocation = Vector3.Parse( xtr.ReadElementString("UserLocation")); 119 landData.UserLocation = Vector3.Parse( xtr.ReadElementString("UserLocation"));
120 landData.UserLookAt = Vector3.Parse( xtr.ReadElementString("UserLookAt")); 120 landData.UserLookAt = Vector3.Parse( xtr.ReadElementString("UserLookAt"));
121 landData.Dwell = Convert.ToInt32( xtr.ReadElementString("Dwell")); 121 // No longer used here
122 xtr.ReadElementString("Dwell");
122 landData.OtherCleanTime = Convert.ToInt32( xtr.ReadElementString("OtherCleanTime")); 123 landData.OtherCleanTime = Convert.ToInt32( xtr.ReadElementString("OtherCleanTime"));
123 124
124 xtr.ReadEndElement(); 125 xtr.ReadEndElement();
@@ -177,7 +178,7 @@ namespace OpenSim.Framework.Serialization.External
177 xtw.WriteElementString("SnapshotID", landData.SnapshotID.ToString()); 178 xtw.WriteElementString("SnapshotID", landData.SnapshotID.ToString());
178 xtw.WriteElementString("UserLocation", landData.UserLocation.ToString()); 179 xtw.WriteElementString("UserLocation", landData.UserLocation.ToString());
179 xtw.WriteElementString("UserLookAt", landData.UserLookAt.ToString()); 180 xtw.WriteElementString("UserLookAt", landData.UserLookAt.ToString());
180 xtw.WriteElementString("Dwell", Convert.ToString(landData.Dwell)); 181 xtw.WriteElementString("Dwell", "0");
181 xtw.WriteElementString("OtherCleanTime", Convert.ToString(landData.OtherCleanTime)); 182 xtw.WriteElementString("OtherCleanTime", Convert.ToString(landData.OtherCleanTime));
182 183
183 xtw.WriteEndElement(); 184 xtw.WriteEndElement();