aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-03 23:48:12 +0000
committerJustin Clark-Casey (justincc)2012-02-03 23:48:12 +0000
commit2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598 (patch)
tree95acd2d2fc13dd77637549d8ce1f0ba78d4eb10d /OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
parentChange SceneObjectSerializer to use common ExternalRepresentationUtils.Execut... (diff)
parentMerge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.zip
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.gz
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.bz2
opensim-SC_OLD-2b6c5fcb3115fa6b963a536f34bd4a4a1a64c598.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 948aac8..8e29e3c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -310,10 +310,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
310 310
311 protected AssetBase PostProcess(AssetBase asset) 311 protected AssetBase PostProcess(AssetBase asset)
312 { 312 {
313 if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("profile")) 313 if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home"))
314 { 314 {
315 //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID); 315 //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID);
316 string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["profile"].ToString(), m_userAccountService, m_scopeID); 316 string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["home"].ToString(), m_userAccountService, m_scopeID);
317 asset.Data = Utils.StringToBytes(xml); 317 asset.Data = Utils.StringToBytes(xml);
318 } 318 }
319 return asset; 319 return asset;