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/CoreModules/Avatar/BakedTextures/XBakesModule.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/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index 013b416..61e461a 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |||
| @@ -124,8 +124,8 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
| 124 | { | 124 | { |
| 125 | using(XmlTextReader sr = new XmlTextReader(s)) | 125 | using(XmlTextReader sr = new XmlTextReader(s)) |
| 126 | { | 126 | { |
| 127 | sr.DtdProcessing = DtdProcessing.Prohibit; | 127 | sr.ProhibitDtd = true; |
| 128 | sr.XmlResolver = null; | 128 | |
| 129 | sr.ReadStartElement("BakedAppearance"); | 129 | sr.ReadStartElement("BakedAppearance"); |
| 130 | while(sr.LocalName == "BakedTexture") | 130 | while(sr.LocalName == "BakedTexture") |
| 131 | { | 131 | { |