From 67e500383eb024fe4dd2681d0c5d902f289b65d8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 9 Jul 2013 14:12:52 -0700
Subject: Put guards on a bunch of exception-inducing code, as seen in logs
 from load test.

---
 OpenSim/Region/Framework/Scenes/Scene.cs                      | 4 +++-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 6 ++++++
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs   | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 355e0ee..54956ee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3687,7 +3687,9 @@ namespace OpenSim.Region.Framework.Scenes
                         "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
                         sp.Name, sp.UUID, RegionInfo.RegionName);
     
-                    sp.ControllingClient.Close(true);
+                    if (sp.ControllingClient != null)
+                        sp.ControllingClient.Close(true);
+
                     sp = null;
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index dcb62f8..527ca35 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -67,6 +67,12 @@ namespace OpenSim.Region.Framework.Scenes
         {
             int scriptsStarted = 0;
 
+            if (m_scene == null)
+            {
+                m_log.DebugFormat("[PRIM INVENTORY]: m_scene is null. Unable to create script instances");
+                return 0;
+            }
+
             // Don't start scripts if they're turned off in the region!
             if (!m_scene.RegionInfo.RegionSettings.DisableScripts)
             {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 7dba7c8..3f223a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -553,7 +553,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public void StopScriptInstance(TaskInventoryItem item)
         {
-            m_part.ParentGroup.Scene.EventManager.TriggerStopScript(m_part.LocalId, item.ItemID);
+            if (m_part.ParentGroup.Scene != null)
+                m_part.ParentGroup.Scene.EventManager.TriggerStopScript(m_part.LocalId, item.ItemID);
 
             // At the moment, even stopped scripts are counted as active, which is probably wrong.
 //            m_part.ParentGroup.AddActiveScriptCount(-1);
-- 
cgit v1.1