From c88e6fb44505ff5530b2723665f81a232eb630ad Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Wed, 14 Nov 2012 07:50:19 -0800
Subject: [PATCH] Possibly fixes mantis #6429 (Flotsam cache having a null ref
 to the asset service)

---
 OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 232d9f507f..8e800cbeb2 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -222,10 +222,6 @@ namespace OpenSim.Region.CoreModules.Asset
                 scene.RegisterModuleInterface<IImprovedAssetCache>(this);
                 m_Scenes.Add(scene);
 
-                if (m_AssetService == null)
-                {
-                    m_AssetService = scene.RequestModuleInterface<IAssetService>();
-                }
             }
         }
 
@@ -240,6 +236,8 @@ namespace OpenSim.Region.CoreModules.Asset
 
         public void RegionLoaded(Scene scene)
         {
+            if (m_Enabled && m_AssetService == null)
+                m_AssetService = scene.RequestModuleInterface<IAssetService>();
         }
 
         ////////////////////////////////////////////////////////////