1 files changed, 18 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index c596f6e..dc9ac37 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 using libsecondlife;
 using log4net;
 using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -78,10 +79,27 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void Close()
         {
+            // collect known shared modules in sharedModules
+            Dictionary<string, IRegionModule> sharedModules = new Dictionary<string, IRegionModule>();
             for (int i = 0; i < m_localScenes.Count; i++)
             {
+                // extract known shared modules from scene 
+                foreach(string k in m_localScenes[i].Modules.Keys)
+                {
+                    if (m_localScenes[i].Modules[k].IsSharedModule &&
+                        !sharedModules.ContainsKey(k))
+                        sharedModules[k] = m_localScenes[i].Modules[k];
+                }
+                // close scene/region
                 m_localScenes[i].Close();
             }
+
+            // all regions/scenes are now closed, we can now safely
+            // close all shared modules
+            foreach(IRegionModule mod in sharedModules.Values)
+            {
+                mod.Close();
+            }
         }
 
         public void Close(Scene cscene)