diff options
| author | Melanie | 2012-02-03 00:05:59 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-03 00:05:59 +0000 |
| commit | 573a64ad246fb7052b8bfbf6004f4926c853a0a0 (patch) | |
| tree | 1a597257247834df8c34e1752ba47a96351a2f16 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix test failure (diff) | |
| download | opensim-SC_OLD-573a64ad246fb7052b8bfbf6004f4926c853a0a0.zip opensim-SC_OLD-573a64ad246fb7052b8bfbf6004f4926c853a0a0.tar.gz opensim-SC_OLD-573a64ad246fb7052b8bfbf6004f4926c853a0a0.tar.bz2 opensim-SC_OLD-573a64ad246fb7052b8bfbf6004f4926c853a0a0.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Serialization/External/LandDataSerializer.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index c61b9e8..3ae9a8e 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
| @@ -105,6 +105,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 105 | pae.AgentID = UUID.Parse( xtr.ReadElementString("AgentID")); | 105 | pae.AgentID = UUID.Parse( xtr.ReadElementString("AgentID")); |
| 106 | // We really don't care about temp vs perm here and this | 106 | // We really don't care about temp vs perm here and this |
| 107 | // would break on old oars. Assume all bans are perm | 107 | // would break on old oars. Assume all bans are perm |
| 108 | xtr.ReadElementString("Time"); | ||
| 108 | pae.Expires = 0; // Convert.ToUint( xtr.ReadElementString("Time")); | 109 | pae.Expires = 0; // Convert.ToUint( xtr.ReadElementString("Time")); |
| 109 | pae.Flags = (AccessList)Convert.ToUInt32( xtr.ReadElementString("AccessList")); | 110 | pae.Flags = (AccessList)Convert.ToUInt32( xtr.ReadElementString("AccessList")); |
| 110 | xtr.ReadEndElement(); | 111 | xtr.ReadEndElement(); |