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/Serialization/External/UserInventoryItemSerializer.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/Framework/Serialization/External/UserInventoryItemSerializer.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index 3c51140..12194ad 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs | |||
| @@ -202,8 +202,7 @@ namespace OpenSim.Framework.Serialization.External | |||
| 202 | 202 | ||
| 203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) | 203 | using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization))) |
| 204 | { | 204 | { |
| 205 | reader.DtdProcessing = DtdProcessing.Prohibit; | 205 | reader.ProhibitDtd = true; |
| 206 | reader.XmlResolver = null; | ||
| 207 | 206 | ||
| 208 | reader.ReadStartElement("InventoryItem"); | 207 | reader.ReadStartElement("InventoryItem"); |
| 209 | 208 | ||