diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index cbb2a5a..4d2db17 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -336,7 +336,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
336 | { | 336 | { |
337 | AssetInfo assetInf = new AssetInfo(asset); | 337 | AssetInfo assetInf = new AssetInfo(asset); |
338 | 338 | ||
339 | ProcessReceivedAsset(IsTexture, assetInf); | 339 | ProcessReceivedAsset(IsTexture, assetInf, null); |
340 | 340 | ||
341 | if (!m_memcache.Contains(assetInf.FullID)) | 341 | if (!m_memcache.Contains(assetInf.FullID)) |
342 | { | 342 | { |
@@ -391,11 +391,11 @@ namespace OpenSim.Framework.Communications.Cache | |||
391 | } | 391 | } |
392 | } | 392 | } |
393 | 393 | ||
394 | protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf) | 394 | protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService) |
395 | { | 395 | { |
396 | if(!IsTexture && assetInf.ContainsReferences && false ) | 396 | if(!IsTexture && assetInf.ContainsReferences && false ) |
397 | { | 397 | { |
398 | assetInf.Data = ProcessAssetData(assetInf.Data); | 398 | assetInf.Data = ProcessAssetData(assetInf.Data, userService ); |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
@@ -554,11 +554,11 @@ namespace OpenSim.Framework.Communications.Cache | |||
554 | } | 554 | } |
555 | } | 555 | } |
556 | 556 | ||
557 | public byte[] ProcessAssetData(byte[] assetData) | 557 | public byte[] ProcessAssetData(byte[] assetData, IUserService userService) |
558 | { | 558 | { |
559 | string data = Encoding.ASCII.GetString(assetData); | 559 | string data = Encoding.ASCII.GetString(assetData); |
560 | 560 | ||
561 | data = ProcessAssetDataString(data, null); | 561 | data = ProcessAssetDataString(data, userService ); |
562 | 562 | ||
563 | return Encoding.ASCII.GetBytes( data ); | 563 | return Encoding.ASCII.GetBytes( data ); |
564 | } | 564 | } |