diff options
author | Kitto Flora | 2010-09-06 21:45:17 +0000 |
---|---|---|
committer | Kitto Flora | 2010-09-06 21:45:17 +0000 |
commit | cfaefad754642677dbddfcbe743c3fa5e058785d (patch) | |
tree | 48ac26cc5289d8c0459837cd7d6936152216403b /OpenSim/Framework/Serialization/External | |
parent | Falling animation fix, comment out instrumentation. (diff) | |
parent | Fix yet another cause of "Ghost attachments" (diff) | |
download | opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.zip opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.gz opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.bz2 opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Serialization/External')
-rw-r--r-- | OpenSim/Framework/Serialization/External/LandDataSerializer.cs | 5 |
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(); |