aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-02-25 21:42:07 +0000
committerJustin Clark-Casey (justincc)2015-02-25 21:42:07 +0000
commit5fa651c529b0c4fac3467c0fd93234eb37359de7 (patch)
tree27abfd829fa9773aca94974cdf5dd020ad034f60 /OpenSim
parentFix bug where the uuid gatherer was not inspecting UUIDs for items in an embe... (diff)
downloadopensim-SC_OLD-5fa651c529b0c4fac3467c0fd93234eb37359de7.zip
opensim-SC_OLD-5fa651c529b0c4fac3467c0fd93234eb37359de7.tar.gz
opensim-SC_OLD-5fa651c529b0c4fac3467c0fd93234eb37359de7.tar.bz2
opensim-SC_OLD-5fa651c529b0c4fac3467c0fd93234eb37359de7.tar.xz
minor: In HGAssetMapper, don't complain on seeing an XmlDeclaration as we know that we not using those in transformation.
Relates to http://opensimulator.org/mantis/view.php?id=7447
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 9c801be..8b09b3e 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -318,6 +318,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
318 writer.WriteString(reader.Value); 318 writer.WriteString(reader.Value);
319 break; 319 break;
320 320
321 case XmlNodeType.XmlDeclaration:
322 // For various reasons, not all serializations have xml declarations (or consistent ones)
323 // and as it's embedded inside a byte stream we don't need it anyway, so ignore.
324 break;
325
321 default: 326 default:
322 m_log.WarnFormat( 327 m_log.WarnFormat(
323 "[HG ASSET MAPPER]: Unrecognized node {0} in asset XML transform in {1}", 328 "[HG ASSET MAPPER]: Unrecognized node {0} in asset XML transform in {1}",