aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-22 00:49:17 +0000
committerJustin Clarke Casey2008-05-22 00:49:17 +0000
commit61bba6375c91ba246e5139c1f449d03169ce31ce (patch)
treee537ffec5f8aaf522db842f89c6aa9049445a176 /OpenSim/Framework
parent* Minor: Tidy ups and logging tweaks. (diff)
downloadopensim-SC_OLD-61bba6375c91ba246e5139c1f449d03169ce31ce.zip
opensim-SC_OLD-61bba6375c91ba246e5139c1f449d03169ce31ce.tar.gz
opensim-SC_OLD-61bba6375c91ba246e5139c1f449d03169ce31ce.tar.bz2
opensim-SC_OLD-61bba6375c91ba246e5139c1f449d03169ce31ce.tar.xz
* Fix mantis 1325. This is a minor issue where 'show assets' would not work fully in the region console
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs22
1 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 796be5b..3ae18f1 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -104,22 +104,28 @@ namespace OpenSim.Framework.Communications.Cache
104 104
105 foreach (TextureImage texture in Textures.Values) 105 foreach (TextureImage texture in Textures.Values)
106 { 106 {
107 if (texture.Temporary) 107 if (texture != null)
108 { 108 {
109 temporaryImages++; 109 if (texture.Temporary)
110 } 110 {
111 temporaryImages++;
112 }
111 113
112 imageBytes += texture.Data.GetLongLength(0); 114 imageBytes += texture.Data.GetLongLength(0);
115 }
113 } 116 }
114 117
115 foreach (AssetInfo asset in Assets.Values) 118 foreach (AssetInfo asset in Assets.Values)
116 { 119 {
117 if (asset.Temporary) 120 if (asset != null)
118 { 121 {
119 temporaryAssets++; 122 if (asset.Temporary)
120 } 123 {
124 temporaryAssets++;
125 }
121 126
122 assetBytes += asset.Data.GetLongLength(0); 127 assetBytes += asset.Data.GetLongLength(0);
128 }
123 } 129 }
124 130
125 m_log.InfoFormat("Temporary Images: {0} Temporary Assets: {1}", 131 m_log.InfoFormat("Temporary Images: {0} Temporary Assets: {1}",