Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2018-01-16 17:17:44 +00:00
22 changed files with 32 additions and 42 deletions

View File

@@ -1148,8 +1148,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
using (Stream s = rsp.GetResponseStream())
using (XmlTextReader rdr = new XmlTextReader(s))
{
rdr.DtdProcessing = DtdProcessing.Prohibit;
rdr.XmlResolver = null;
rdr.ProhibitDtd = true;
doc.Load(rdr);
}
}