From 23bf1bf6e0513be9673b290c3ebbdc6b79ab21a9 Mon Sep 17 00:00:00 2001
From: Charles Krinke <cfk@pacbell.net>
Date: Tue, 2 Jun 2009 21:13:29 +0000
Subject: [PATCH] Thank you kindly, MattSetzer, for a patch that solves a
 Mantis: This appears to be due to the fact that no asset cache has been
 configured, possibly as a result of the configuration changes that have been
 made recently. I've attached a patch to display a message to that effect
 rather than throwing an error.

---
 OpenSim/Region/Application/OpenSim.cs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 36fad48ea2..aef0b91258 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -413,7 +413,14 @@ namespace OpenSim
 
         private void HandleClearAssets(string module, string[] args)
         {
-            m_assetCache.Clear();
+            if (AssetCache != null)
+            {
+                AssetCache.Clear();
+            }
+            else
+            {
+                m_log.Info("Asset cache is not configured.");
+            }
         }
 
         private void HandleForceUpdate(string module, string[] args)
@@ -787,7 +794,14 @@ namespace OpenSim
             switch (showParams[0])
             {
                 case "assets":
-                    m_assetCache.ShowState();
+                    if (AssetCache != null)
+                    {
+                        AssetCache.ShowState();
+                    }
+                    else
+                    {
+                        m_log.Info("Asset cache is not configured.");
+                    }
                     break;
 
                 case "users":