1 files changed, 11 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6850312..fa1fd89 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -538,7 +538,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void AdjustKnownSeeds()
         {
-            Dictionary<ulong, string> seeds = Scene.CapsModule.GetChildrenSeeds(UUID);
+            Dictionary<ulong, string> seeds;
+
+            if (Scene.CapsModule != null)
+                seeds = Scene.CapsModule.GetChildrenSeeds(UUID);
+            else
+                seeds = new Dictionary<ulong, string>();
+
             List<ulong> old = new List<ulong>();
             foreach (ulong handle in seeds.Keys)
             {
@@ -552,7 +558,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
             DropOldNeighbours(old);
-            Scene.CapsModule.SetChildrenSeed(UUID, seeds);
+            
+            if (Scene.CapsModule != null)
+                Scene.CapsModule.SetChildrenSeed(UUID, seeds);
+            
             KnownRegions = seeds;
             //m_log.Debug(" ++++++++++AFTER+++++++++++++ ");
             //DumpKnownRegions();