diff options
author | UbitUmarov | 2018-01-05 12:24:07 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-05 12:24:07 +0000 |
commit | 89a690c11f8c7b6bbe0b6339e79a64d1ae428aec (patch) | |
tree | eb039c92222bf22359a20ecb5294b8ab1b2a38eb /OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |
parent | don't be bad Jenkins.. (diff) | |
download | opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.zip opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.tar.gz opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.tar.bz2 opensim-SC_OLD-89a690c11f8c7b6bbe0b6339e79a64d1ae428aec.tar.xz |
a few more xml things
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 34fdb6d..977dd73 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -49,14 +49,19 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
49 | public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) | 49 | public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) |
50 | { | 50 | { |
51 | XmlDocument doc = new XmlDocument(); | 51 | XmlDocument doc = new XmlDocument(); |
52 | doc.XmlResolver=null; | ||
52 | XmlNode rootNode; | 53 | XmlNode rootNode; |
53 | 54 | ||
54 | if (fileName.StartsWith("http:") || File.Exists(fileName)) | 55 | if (fileName.StartsWith("http:") || File.Exists(fileName)) |
55 | { | 56 | { |
56 | XmlTextReader reader = new XmlTextReader(fileName); | 57 | using(XmlTextReader reader = new XmlTextReader(fileName)) |
57 | reader.WhitespaceHandling = WhitespaceHandling.None; | 58 | { |
58 | doc.Load(reader); | 59 | reader.WhitespaceHandling = WhitespaceHandling.None; |
59 | reader.Close(); | 60 | reader.DtdProcessing = DtdProcessing.Prohibit; |
61 | reader.XmlResolver = null; | ||
62 | |||
63 | doc.Load(reader); | ||
64 | } | ||
60 | rootNode = doc.FirstChild; | 65 | rootNode = doc.FirstChild; |
61 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 66 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
62 | { | 67 | { |