diff options
| author | Robert Adams | 2014-08-30 08:29:39 -0700 |
|---|---|---|
| committer | Robert Adams | 2014-08-30 08:29:39 -0700 |
| commit | 3d65d221380be455ea79601798abcba490a912e0 (patch) | |
| tree | 551e7c98ce1695e9b42ac5de1d96ccddd095f947 /OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |
| parent | Merge branch 'master' into bullet-2.82 (diff) | |
| parent | As per the LL grid, if an avatar is sitting then return it's velocity relativ... (diff) | |
| download | opensim-SC_OLD-3d65d221380be455ea79601798abcba490a912e0.zip opensim-SC_OLD-3d65d221380be455ea79601798abcba490a912e0.tar.gz opensim-SC_OLD-3d65d221380be455ea79601798abcba490a912e0.tar.bz2 opensim-SC_OLD-3d65d221380be455ea79601798abcba490a912e0.tar.xz | |
Merge branch 'master' into bullet-2.82
Diffstat (limited to 'OpenSim/Framework/Serialization/External/LandDataSerializer.cs')
| -rw-r--r-- | OpenSim/Framework/Serialization/External/LandDataSerializer.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs index 4b5326a..e42d56f 100644 --- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs +++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs | |||
| @@ -44,11 +44,11 @@ namespace OpenSim.Framework.Serialization.External | |||
| 44 | { | 44 | { |
| 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 46 | 46 | ||
| 47 | private static Dictionary<string, Action<LandData, XmlTextReader>> m_ldProcessors | 47 | private static Dictionary<string, Action<LandData, XmlReader>> m_ldProcessors |
| 48 | = new Dictionary<string, Action<LandData, XmlTextReader>>(); | 48 | = new Dictionary<string, Action<LandData, XmlReader>>(); |
| 49 | 49 | ||
| 50 | private static Dictionary<string, Action<LandAccessEntry, XmlTextReader>> m_laeProcessors | 50 | private static Dictionary<string, Action<LandAccessEntry, XmlReader>> m_laeProcessors |
| 51 | = new Dictionary<string, Action<LandAccessEntry, XmlTextReader>>(); | 51 | = new Dictionary<string, Action<LandAccessEntry, XmlReader>>(); |
| 52 | 52 | ||
| 53 | static LandDataSerializer() | 53 | static LandDataSerializer() |
| 54 | { | 54 | { |
| @@ -134,7 +134,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 134 | "AccessList", (lae, xtr) => lae.Flags = (AccessList)Convert.ToUInt32(xtr.ReadElementString("AccessList"))); | 134 | "AccessList", (lae, xtr) => lae.Flags = (AccessList)Convert.ToUInt32(xtr.ReadElementString("AccessList"))); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | public static void ProcessParcelAccessList(LandData ld, XmlTextReader xtr) | 137 | public static void ProcessParcelAccessList(LandData ld, XmlReader xtr) |
| 138 | { | 138 | { |
| 139 | if (!xtr.IsEmptyElement) | 139 | if (!xtr.IsEmptyElement) |
| 140 | { | 140 | { |