diff options
| author | Diva Canto | 2015-05-05 20:59:09 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-05-05 20:59:09 -0700 |
| commit | 1abbad71b4603245e5481c11e3ce55f57b64935f (patch) | |
| tree | 694b750495216edbb16a2822a546e7617eff2c66 /OpenSim/Region/CoreModules/World | |
| parent | Revert "Patch llCastRay fully-simplified to V2." for further review. (diff) | |
| download | opensim-SC_OLD-1abbad71b4603245e5481c11e3ce55f57b64935f.zip opensim-SC_OLD-1abbad71b4603245e5481c11e3ce55f57b64935f.tar.gz opensim-SC_OLD-1abbad71b4603245e5481c11e3ce55f57b64935f.tar.bz2 opensim-SC_OLD-1abbad71b4603245e5481c11e3ce55f57b64935f.tar.xz | |
Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 4d99a6e..db66c83 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
| @@ -335,7 +335,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 335 | if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home")) | 335 | if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home")) |
| 336 | { | 336 | { |
| 337 | //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID); | 337 | //m_log.DebugFormat("[ARCHIVER]: Rewriting object data for {0}", asset.ID); |
| 338 | string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), m_options["home"].ToString(), m_userAccountService, m_scopeID); | 338 | string xml = ExternalRepresentationUtils.RewriteSOP(Utils.BytesToString(asset.Data), string.Empty, m_options["home"].ToString(), m_userAccountService, m_scopeID); |
| 339 | asset.Data = Utils.StringToBytes(xml); | 339 | asset.Data = Utils.StringToBytes(xml); |
| 340 | } | 340 | } |
| 341 | return asset; | 341 | return asset; |