diff options
author | Justin Clark-Casey (justincc) | 2012-05-23 02:09:31 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-23 02:09:31 +0100 |
commit | 68918d632f0521941f67fe2c7b9c87ed048e2b92 (patch) | |
tree | d8e9be26790a540efcb403730e2adf71c38a74bd /OpenSim/Region | |
parent | minor: Make log class names in InventoryAccessModule uniform (diff) | |
download | opensim-SC-68918d632f0521941f67fe2c7b9c87ed048e2b92.zip opensim-SC-68918d632f0521941f67fe2c7b9c87ed048e2b92.tar.gz opensim-SC-68918d632f0521941f67fe2c7b9c87ed048e2b92.tar.bz2 opensim-SC-68918d632f0521941f67fe2c7b9c87ed048e2b92.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
71 | public void AddRegion(Scene scene) | 71 | public void AddRegion(Scene scene) |
72 | { | 72 | { |
73 | m_scene = scene; | 73 | m_scene = scene; |
74 | m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>(); | ||
75 | m_scene.RegisterModuleInterface<IAttachmentsModule>(this); | 74 | m_scene.RegisterModuleInterface<IAttachmentsModule>(this); |
76 | 75 | ||
77 | if (Enabled) | 76 | if (Enabled) |
@@ -90,6 +89,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
90 | 89 | ||
91 | public void RegionLoaded(Scene scene) | 90 | public void RegionLoaded(Scene scene) |
92 | { | 91 | { |
92 | m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>(); | ||
93 | m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>(); | 93 | m_invAccessModule = m_scene.RequestModuleInterface<IInventoryAccessModule>(); |
94 | } | 94 | } |
95 | 95 | ||