Put guards on a bunch of exception-inducing code, as seen in logs from load test.

This commit is contained in:
Diva Canto
2013-07-09 14:12:52 -07:00
parent b2d4b8b1da
commit 67e500383e
6 changed files with 20 additions and 6 deletions

View File

@@ -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)
{