Merge branch 'master' into httptests

1 files changed, 9 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 89d78cf..1beca04 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -196,13 +196,15 @@ namespace OpenSim.Region.Framework.Scenes
         // ITerrainChannel.LoadFromXmlString()
         public void LoadFromXmlString(string data)
         {
-            StringReader sr = new StringReader(data);
-            XmlTextReader reader = new XmlTextReader(sr);
-            reader.Read();
-
-            ReadXml(reader);
-            reader.Close();
-            sr.Close();
+            using(StringReader sr = new StringReader(data))
+            {
+                using(XmlTextReader reader = new XmlTextReader(sr))
+                {
+                    reader.DtdProcessing = DtdProcessing.Prohibit;
+                    reader.XmlResolver = null;
+                    ReadXml(reader);
+                }
+            }
         }
 
         // ITerrainChannel.Merge