diff options
author | Jeff Ames | 2009-04-14 11:38:33 +0000 |
---|---|---|
committer | Jeff Ames | 2009-04-14 11:38:33 +0000 |
commit | cad0aab7934bf0f81634c44fc03876f4b252eaa8 (patch) | |
tree | 36883ff05989dd98d67902dab94922fca6b564f7 /OpenSim/Framework | |
parent | Add copyright headers. (diff) | |
download | opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.zip opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.tar.gz opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.tar.bz2 opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-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 4d2db17..f8b5757 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -393,9 +393,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
393 | 393 | ||
394 | protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService) | 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, userService ); | 398 | assetInf.Data = ProcessAssetData(assetInf.Data, userService); |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
@@ -558,9 +558,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
558 | { | 558 | { |
559 | string data = Encoding.ASCII.GetString(assetData); | 559 | string data = Encoding.ASCII.GetString(assetData); |
560 | 560 | ||
561 | data = ProcessAssetDataString(data, userService ); | 561 | data = ProcessAssetDataString(data, userService); |
562 | 562 | ||
563 | return Encoding.ASCII.GetBytes( data ); | 563 | return Encoding.ASCII.GetBytes(data); |
564 | } | 564 | } |
565 | 565 | ||
566 | public string ProcessAssetDataString(string data, IUserService userService) | 566 | public string ProcessAssetDataString(string data, IUserService userService) |
@@ -600,7 +600,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
600 | { | 600 | { |
601 | Guid id; | 601 | Guid id; |
602 | UserProfileData userProfile = userService.GetUserProfile(userUri); | 602 | UserProfileData userProfile = userService.GetUserProfile(userUri); |
603 | if( userProfile == null ) | 603 | if (userProfile == null) |
604 | { | 604 | { |
605 | id = Guid.Empty; | 605 | id = Guid.Empty; |
606 | } | 606 | } |