diff options
| author | UbitUmarov | 2018-01-05 22:37:42 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-05 22:37:42 +0000 |
| commit | 875ca104b85dbf48fc0e5035dc2c01b10a61f8e9 (patch) | |
| tree | 5a48cbd483b57c88d5be9c012e8f28422f3e368f /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | a few more xml things (diff) | |
| download | opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.zip opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.gz opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.bz2 opensim-SC-875ca104b85dbf48fc0e5035dc2c01b10a61f8e9.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs index 8f12331..01c5d3b 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs | |||
| @@ -93,6 +93,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 93 | Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); | 93 | Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); |
| 94 | string xmlData = Utils.BytesToString(ncAssetGet.Data); | 94 | string xmlData = Utils.BytesToString(ncAssetGet.Data); |
| 95 | XmlDocument ncAssetGetXmlDoc = new XmlDocument(); | 95 | XmlDocument ncAssetGetXmlDoc = new XmlDocument(); |
| 96 | ncAssetGetXmlDoc.XmlResolver=null; | ||
| 96 | ncAssetGetXmlDoc.LoadXml(xmlData); | 97 | ncAssetGetXmlDoc.LoadXml(xmlData); |
| 97 | 98 | ||
| 98 | // Console.WriteLine(ncAssetGetXmlDoc.OuterXml); | 99 | // Console.WriteLine(ncAssetGetXmlDoc.OuterXml); |