From 68918d632f0521941f67fe2c7b9c87ed048e2b92 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 02:09:31 +0100
Subject: Fetch the dialog module reference in AttachmentsModule in
 RegionLoaded() not AddRegion()

The reference is not guaranteed to be there when AddRegion() is called but will definitely be present at RegionLoaded() if it's going to be present at all.
---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index d099511..510b483 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
-            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
 
             if (Enabled)
@@ -90,6 +89,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         
         public void RegionLoaded(Scene scene)
         {
+            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>();
         }
         
-- 
cgit v1.1