aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-06 20:12:08 +0000
committerJustin Clarke Casey2009-03-06 20:12:08 +0000
commit85774de2310141f4311bc3df1946d44df9ddde59 (patch)
treee86febe5873121d9a529f6d77a2a7ee929030425 /OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
parent* Protects RestClient from crashing with dictionary exception, which leads to... (diff)
downloadopensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.zip
opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.tar.gz
opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.tar.bz2
opensim-SC_OLD-85774de2310141f4311bc3df1946d44df9ddde59.tar.xz
* Improve memory usage when writing OARs
* This should make saving large OARs a somewhat better experience * However, the problem where saving an archive pulls large numbers of assets into the asset cache isn't yet resolved * This patch also removes lots of archive writing spam that crept in
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index e863188..8debfcf 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
110 110
111 xtw.WriteEndDocument(); 111 xtw.WriteEndDocument();
112 112
113 archive.AddFile("assets.xml", sw.ToString()); 113 archive.WriteFile("assets.xml", sw.ToString());
114 } 114 }
115 115
116 /// <summary> 116 /// <summary>
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
141 asset.Type, asset.ID); 141 asset.Type, asset.ID);
142 } 142 }
143 143
144 archive.AddFile( 144 archive.WriteFile(
145 ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension, 145 ArchiveConstants.ASSETS_PATH + uuid.ToString() + extension,
146 asset.Data); 146 asset.Data);
147 147