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/Animation | |
| 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/Framework/Scenes/Animation')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs index 38ab934..2128d58 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | |||
| @@ -58,8 +58,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 58 | 58 | ||
| 59 | using (XmlTextReader reader = new XmlTextReader(path)) | 59 | using (XmlTextReader reader = new XmlTextReader(path)) |
| 60 | { | 60 | { |
| 61 | reader.DtdProcessing = DtdProcessing.Prohibit; | 61 | reader.ProhibitDtd = true; |
| 62 | reader.XmlResolver = null; | 62 | |
| 63 | XmlDocument doc = new XmlDocument(); | 63 | XmlDocument doc = new XmlDocument(); |
| 64 | doc.XmlResolver = null; | 64 | doc.XmlResolver = null; |
| 65 | 65 | ||