diff options
author | Diva Canto | 2013-07-09 14:12:52 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-09 14:12:52 -0700 |
commit | 67e500383eb024fe4dd2681d0c5d902f289b65d8 (patch) | |
tree | f3523d8849fd573208869bf8e0aa8a77eb2c2077 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
parent | BaseHttpServer: if the handler sets the content length, don't override it. Th... (diff) | |
download | opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.zip opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.gz opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.bz2 opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.xz |
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 6 |
1 files changed, 6 insertions, 0 deletions
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 | |||
67 | { | 67 | { |
68 | int scriptsStarted = 0; | 68 | int scriptsStarted = 0; |
69 | 69 | ||
70 | if (m_scene == null) | ||
71 | { | ||
72 | m_log.DebugFormat("[PRIM INVENTORY]: m_scene is null. Unable to create script instances"); | ||
73 | return 0; | ||
74 | } | ||
75 | |||
70 | // Don't start scripts if they're turned off in the region! | 76 | // Don't start scripts if they're turned off in the region! |
71 | if (!m_scene.RegionInfo.RegionSettings.DisableScripts) | 77 | if (!m_scene.RegionInfo.RegionSettings.DisableScripts) |
72 | { | 78 | { |