Merge branch 'master' into bullet-2.82

4 files changed, 36 insertions, 36 deletions

diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index db46ea8..6debf65 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <param name="xtr"></param>
         /// <returns>true on successful, false if there were any processing failures</returns>
         public static bool ExecuteReadProcessors<NodeType>(
-            NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlTextReader>> processors, XmlTextReader xtr)
+            NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlReader>> processors, XmlReader xtr)
         {
             return ExecuteReadProcessors(
                 nodeToFill,
@@ -75,8 +75,8 @@ namespace OpenSim.Framework.Serialization.External
         /// <returns>true on successful, false if there were any processing failures</returns>
         public static bool ExecuteReadProcessors<NodeType>(
             NodeType nodeToFill,
-            Dictionary<string, Action<NodeType, XmlTextReader>> processors,
-            XmlTextReader xtr,
+            Dictionary<string, Action<NodeType, XmlReader>> processors,
+            XmlReader xtr,
             Action<NodeType, string, Exception> parseExceptionAction)
         {
             bool errors = false;
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Serialization.External
 
 //                        m_log.DebugFormat("[ExternalRepresentationUtils]: Processing: {0}", nodeName);
 
-                Action<NodeType, XmlTextReader> p = null;
+                Action<NodeType, XmlReader> p = null;
                 if (processors.TryGetValue(xtr.Name, out p))
                 {
 //                            m_log.DebugFormat("[ExternalRepresentationUtils]: Found {0} processor, nodeName);
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
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static Dictionary<string, Action<LandData, XmlTextReader>> m_ldProcessors
-            = new Dictionary<string, Action<LandData, XmlTextReader>>();
+        private static Dictionary<string, Action<LandData, XmlReader>> m_ldProcessors
+            = new Dictionary<string, Action<LandData, XmlReader>>();
 
-        private static Dictionary<string, Action<LandAccessEntry, XmlTextReader>> m_laeProcessors
-            = new Dictionary<string, Action<LandAccessEntry, XmlTextReader>>();
+        private static Dictionary<string, Action<LandAccessEntry, XmlReader>> m_laeProcessors
+            = new Dictionary<string, Action<LandAccessEntry, XmlReader>>();
 
         static LandDataSerializer()
         {
@@ -134,7 +134,7 @@ namespace OpenSim.Framework.Serialization.External
                 "AccessList",       (lae, xtr) => lae.Flags = (AccessList)Convert.ToUInt32(xtr.ReadElementString("AccessList")));
         }
 
-        public static void ProcessParcelAccessList(LandData ld, XmlTextReader xtr)
+        public static void ProcessParcelAccessList(LandData ld, XmlReader xtr)
         {
             if (!xtr.IsEmptyElement)
             {
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 135cefb..994cede 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -46,8 +46,8 @@ namespace OpenSim.Framework.Serialization.External
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
-            = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();
+        private static Dictionary<string, Action<InventoryItemBase, XmlReader>> m_InventoryItemXmlProcessors
+            = new Dictionary<string, Action<InventoryItemBase, XmlReader>>();
 
         #region InventoryItemBase Processor initialization 
         static UserInventoryItemSerializer()
@@ -76,103 +76,103 @@ namespace OpenSim.Framework.Serialization.External
         #endregion 
 
         #region InventoryItemBase Processors
-        private static void ProcessName(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessName(InventoryItemBase item, XmlReader reader)
         {
             item.Name = reader.ReadElementContentAsString("Name", String.Empty);
         }
 
-        private static void ProcessID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessID(InventoryItemBase item, XmlReader reader)
         {
             item.ID = Util.ReadUUID(reader, "ID");
         }
 
-        private static void ProcessInvType(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessInvType(InventoryItemBase item, XmlReader reader)
         {
             item.InvType = reader.ReadElementContentAsInt("InvType", String.Empty);
         }
 
-        private static void ProcessCreatorUUID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreatorUUID(InventoryItemBase item, XmlReader reader)
         {
             item.CreatorId = reader.ReadElementContentAsString("CreatorUUID", String.Empty);
         }
 
-        private static void ProcessCreatorID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreatorID(InventoryItemBase item, XmlReader reader)
         {
             // when it exists, this overrides the previous
             item.CreatorId = reader.ReadElementContentAsString("CreatorID", String.Empty);
         }
 
-        private static void ProcessCreationDate(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreationDate(InventoryItemBase item, XmlReader reader)
         {
             item.CreationDate = reader.ReadElementContentAsInt("CreationDate", String.Empty);
         }
 
-        private static void ProcessOwner(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessOwner(InventoryItemBase item, XmlReader reader)
         {
             item.Owner = Util.ReadUUID(reader, "Owner");
         }
 
-        private static void ProcessDescription(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessDescription(InventoryItemBase item, XmlReader reader)
         {
             item.Description = reader.ReadElementContentAsString("Description", String.Empty);
         }
 
-        private static void ProcessAssetType(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessAssetType(InventoryItemBase item, XmlReader reader)
         {
             item.AssetType = reader.ReadElementContentAsInt("AssetType", String.Empty);
         }
 
-        private static void ProcessAssetID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessAssetID(InventoryItemBase item, XmlReader reader)
         {
             item.AssetID = Util.ReadUUID(reader, "AssetID");
         }
 
-        private static void ProcessSaleType(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessSaleType(InventoryItemBase item, XmlReader reader)
         {
             item.SaleType = (byte)reader.ReadElementContentAsInt("SaleType", String.Empty);
         }
 
-        private static void ProcessSalePrice(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessSalePrice(InventoryItemBase item, XmlReader reader)
         {
             item.SalePrice = reader.ReadElementContentAsInt("SalePrice", String.Empty);
         }
 
-        private static void ProcessBasePermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessBasePermissions(InventoryItemBase item, XmlReader reader)
         {
             item.BasePermissions = (uint)reader.ReadElementContentAsInt("BasePermissions", String.Empty);
         }
 
-        private static void ProcessCurrentPermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCurrentPermissions(InventoryItemBase item, XmlReader reader)
         {
             item.CurrentPermissions = (uint)reader.ReadElementContentAsInt("CurrentPermissions", String.Empty);
         }
 
-        private static void ProcessEveryOnePermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessEveryOnePermissions(InventoryItemBase item, XmlReader reader)
         {
             item.EveryOnePermissions = (uint)reader.ReadElementContentAsInt("EveryOnePermissions", String.Empty);
         }
 
-        private static void ProcessNextPermissions(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessNextPermissions(InventoryItemBase item, XmlReader reader)
         {
             item.NextPermissions = (uint)reader.ReadElementContentAsInt("NextPermissions", String.Empty);
         }
 
-        private static void ProcessFlags(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessFlags(InventoryItemBase item, XmlReader reader)
         {
             item.Flags = (uint)reader.ReadElementContentAsInt("Flags", String.Empty);
         }
 
-        private static void ProcessGroupID(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessGroupID(InventoryItemBase item, XmlReader reader)
         {
             item.GroupID = Util.ReadUUID(reader, "GroupID");
         }
 
-        private static void ProcessGroupOwned(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessGroupOwned(InventoryItemBase item, XmlReader reader)
         {
             item.GroupOwned = Util.ReadBoolean(reader);
         }
 
-        private static void ProcessCreatorData(InventoryItemBase item, XmlTextReader reader)
+        private static void ProcessCreatorData(InventoryItemBase item, XmlReader reader)
         {
             item.CreatorData = reader.ReadElementContentAsString("CreatorData", String.Empty);
         }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 2d0178e..2c38571 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2605,7 +2605,7 @@ namespace OpenSim.Framework
         }
 
         #region Xml Serialization Utilities
-        public static bool ReadBoolean(XmlTextReader reader)
+        public static bool ReadBoolean(XmlReader reader)
         {
             // AuroraSim uses "int" for some fields that are boolean in OpenSim, e.g. "PassCollisions". Don't fail because of this.
             reader.ReadStartElement();
@@ -2616,7 +2616,7 @@ namespace OpenSim.Framework
             return result;
         }
 
-        public static UUID ReadUUID(XmlTextReader reader, string name)
+        public static UUID ReadUUID(XmlReader reader, string name)
         {
             UUID id;
             string idStr;
@@ -2635,7 +2635,7 @@ namespace OpenSim.Framework
             return id;
         }
 
-        public static Vector3 ReadVector(XmlTextReader reader, string name)
+        public static Vector3 ReadVector(XmlReader reader, string name)
         {
             Vector3 vec;
 
@@ -2648,7 +2648,7 @@ namespace OpenSim.Framework
             return vec;
         }
 
-        public static Quaternion ReadQuaternion(XmlTextReader reader, string name)
+        public static Quaternion ReadQuaternion(XmlReader reader, string name)
         {
             Quaternion quat = new Quaternion();
 
@@ -2677,7 +2677,7 @@ namespace OpenSim.Framework
             return quat;
         }
 
-        public static T ReadEnum<T>(XmlTextReader reader, string name)
+        public static T ReadEnum<T>(XmlReader reader, string name)
         {
             string value = reader.ReadElementContentAsString(name, String.Empty);
             // !!!!! to deal with flags without commas