* added count of texture data bytes and asset bytes

2 files changed, 24 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 9435c3d..3e60ceb 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -73,17 +73,22 @@ namespace OpenSim.Framework.Communications.Cache
                 TextureRequests.Count,
                 RequestedAssets.Count,
                 RequestedTextures.Count,
-                RequestLists.Count );
+                RequestLists.Count);
 
             int temporaryImages = 0;
             int temporaryAssets = 0;
 
+            long imageBytes = 0;
+            long assetBytes = 0;
+
             foreach (TextureImage texture in Textures.Values)
             {
-                if(texture.Temporary)
+                if (texture.Temporary)
                 {
-                    temporaryImages++;    
+                    temporaryImages++;
                 }
+
+                imageBytes += texture.Data.GetLongLength(0);
             }
 
             foreach (AssetInfo asset in Assets.Values)
@@ -92,11 +97,18 @@ namespace OpenSim.Framework.Communications.Cache
                 {
                     temporaryAssets++;
                 }
+
+                assetBytes += asset.Data.GetLongLength(0);
             }
 
-            m_log.InfoFormat("Temporary Images:{0}  Temporary Assets:{1}",
+            m_log.InfoFormat("Temporary Images: {0}  Temporary Assets: {1}",
                 temporaryImages,
-                temporaryAssets );
+                temporaryAssets);
+
+            m_log.InfoFormat("Image data: {0}kb  Asset data: {1}kb",
+    imageBytes/1024,
+    assetBytes/1024);
+
         }
 
         public void Clear()
@@ -126,7 +138,7 @@ namespace OpenSim.Framework.Communications.Cache
             m_assetServer = assetServer;
             m_assetServer.SetReceiver(this);
 
-            
+
             m_assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
             m_assetCacheThread.IsBackground = true;
             m_assetCacheThread.Start();
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 6c49586..7cf89b0 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -494,7 +494,9 @@ namespace OpenSim.Region.Environment
             bool permission = false;
 
             if (parcel.landData.ownerID == user)
+            {
                 permission = true;
+            }
 
             if (parcel.landData.isGroupOwned)
             {
@@ -502,10 +504,14 @@ namespace OpenSim.Region.Environment
             }
 
             if (IsEstateManager(user))
+            {
                 permission = true;
+            }
 
             if (IsAdministrator(user))
+            {
                 permission = true;
+            }
 
             return permission;
         }