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/Framework/PrimitiveBaseShape.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 'OpenSim/Framework/PrimitiveBaseShape.cs')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 1dc8bc3..6e7a038 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -1595,8 +1595,7 @@ namespace OpenSim.Framework | |||
| 1595 | { | 1595 | { |
| 1596 | using (XmlTextReader xtr = new XmlTextReader(sr)) | 1596 | using (XmlTextReader xtr = new XmlTextReader(sr)) |
| 1597 | { | 1597 | { |
| 1598 | xtr.DtdProcessing = DtdProcessing.Prohibit; | 1598 | xtr.ProhibitDtd = true; |
| 1599 | xtr.XmlResolver = null; | ||
| 1600 | 1599 | ||
| 1601 | xtr.MoveToContent(); | 1600 | xtr.MoveToContent(); |
| 1602 | 1601 | ||