From 5752c1f5c2ee069e2ff5ffc0ff2f186d7454c5c4 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 28 May 2008 03:44:49 +0000
Subject: Formatting cleanup.

---
 OpenSim/Framework/Communications/Cache/AssetCache.cs | 20 ++++++++++----------
 .../Framework/Communications/Cache/CachedUserInfo.cs | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache')

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index feac65a..dcb7d73 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -249,11 +249,11 @@ namespace OpenSim.Framework.Communications.Cache
             //m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId);
 
 
-            // Xantor 20080526: 
+            // Xantor 20080526:
             // if a request is made for an asset which is not in the cache yet, but has already been requested by
-            // something else, queue up the callbacks on that requestor instead of swamping the assetserver 
+            // something else, queue up the callbacks on that requestor instead of swamping the assetserver
             // with multiple requests for the same asset.
-            
+
             AssetBase asset;
 
             if (TryGetCachedAsset(assetId, out asset))
@@ -265,8 +265,8 @@ namespace OpenSim.Framework.Communications.Cache
 #if DEBUG
                 // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId);
 #endif
-                               
-                
+
+
                 NewAssetRequest req = new NewAssetRequest(assetId, callback);
                 AssetRequestsList requestList;
 
@@ -499,7 +499,7 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 Assets[assetID] = null;
             }
-            
+
             // Notify requesters for this asset
             AssetRequestsList reqList = null;
             lock (RequestLists)
@@ -590,20 +590,20 @@ namespace OpenSim.Framework.Communications.Cache
                     RequestedAssets.Add(requestID, request);
                     m_assetServer.RequestAsset(requestID, false);
                 }
-                
+
                 return;
             }
-            
+
             // It has an entry in our cache
             AssetInfo asset = Assets[requestID];
-            
+
             // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
             if (null == asset)
             {
                 //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing.  Dropping", requestID);
                 return;
             }
-                
+
             // The asset is knosn to exist and is in our cache, so add it to the AssetRequests list
             AssetRequest req = new AssetRequest();
             req.RequestUser = userInfo;
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 1cbffc7..b98cec7 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -485,10 +485,10 @@ namespace OpenSim.Framework.Communications.Cache
         {
             if (HasInventory)
             {
-                if(item.Folder == LLUUID.Zero)
+                if (item.Folder == LLUUID.Zero)
                 {
                     InventoryFolderImpl f=FindFolderForType(item.AssetType);
-                    if(f != null)
+                    if (f != null)
                         item.Folder=f.ID;
                     else
                         item.Folder=RootFolder.ID;
@@ -617,14 +617,14 @@ namespace OpenSim.Framework.Communications.Cache
 
         private InventoryFolderImpl FindFolderForType(int type)
         {
-            if(RootFolder == null)
+            if (RootFolder == null)
                 return null;
             
-            lock(RootFolder.SubFolders)
+            lock (RootFolder.SubFolders)
             {
                 foreach (InventoryFolderImpl f in RootFolder.SubFolders.Values)
                 {
-                    if(f.Type == type)
+                    if (f.Type == type)
                         return f;
                 }
             }
-- 
cgit v1.1