diff options
author | Justin Clark-Casey (justincc) | 2015-02-21 00:08:49 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-02-21 00:08:49 +0000 |
commit | c67b3407d4860f393c086201e6a0f0e0f0bba5aa (patch) | |
tree | ce8b9980eadc138dd9622dc351c8e06b28864215 /OpenSim/Region/CoreModules | |
parent | If HGAssetMapper.PostAsset fails then be more explicit about the uuid, type, ... (diff) | |
download | opensim-SC_OLD-c67b3407d4860f393c086201e6a0f0e0f0bba5aa.zip opensim-SC_OLD-c67b3407d4860f393c086201e6a0f0e0f0bba5aa.tar.gz opensim-SC_OLD-c67b3407d4860f393c086201e6a0f0e0f0bba5aa.tar.bz2 opensim-SC_OLD-c67b3407d4860f393c086201e6a0f0e0f0bba5aa.tar.xz |
In HGAssetMapper.RewriteSOP(), don't explicitly end the document.
The document here has no <?xml declaration. Though ideally it may be present, in practice it has not been added as the data here is embedded within an asset
On Mono 3.2.8 and probably other versions, calling WriteEndDocument() without a declaration does nothing.
On Windows .NET, the same operation throws a "Document does not have a root element" exception which may be contributing to Mantis 7397 and possibly 7439
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs index 0ed8403..9c801be 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | |||
@@ -338,8 +338,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
338 | { | 338 | { |
339 | TransformXml(reader, writer); | 339 | TransformXml(reader, writer); |
340 | 340 | ||
341 | writer.WriteEndDocument(); | ||
342 | |||
343 | // Console.WriteLine("Output: [{0}]", sw.ToString()); | 341 | // Console.WriteLine("Output: [{0}]", sw.ToString()); |
344 | 342 | ||
345 | return sw.ToString(); | 343 | return sw.ToString(); |