diff options
| author | UbitUmarov | 2018-01-16 17:17:44 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-16 17:17:44 +0000 |
| commit | b903287dd154204d7d277b9a5fcd01a4933e67a1 (patch) | |
| tree | 2f23b11df3d832b3631b7415cc6c374b18de2384 /OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |
| parent | update lsl2c tools and parsing files. This may fix some issues with precenden... (diff) | |
| parent | do not timeout BackupWorker threads (diff) | |
| download | opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.zip opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.gz opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.bz2 opensim-SC-b903287dd154204d7d277b9a5fcd01a4933e67a1.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index c3bc4a0..abcb573 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
| @@ -133,8 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 133 | { | 133 | { |
| 134 | using (XmlTextReader reader = new XmlTextReader(sr)) | 134 | using (XmlTextReader reader = new XmlTextReader(sr)) |
| 135 | { | 135 | { |
| 136 | reader.DtdProcessing = DtdProcessing.Prohibit; | 136 | reader.ProhibitDtd = true; |
| 137 | reader.XmlResolver = null; | ||
| 138 | 137 | ||
| 139 | reader.MoveToContent(); // skip possible xml declaration | 138 | reader.MoveToContent(); // skip possible xml declaration |
| 140 | 139 | ||