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/SceneObjectPartInventory.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 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 553 | /// </param> | 553 | /// </param> |
| 554 | public void StopScriptInstance(TaskInventoryItem item) | 554 | public void StopScriptInstance(TaskInventoryItem item) |
| 555 | { | 555 | { |
| 556 | m_part.ParentGroup.Scene.EventManager.TriggerStopScript(m_part.LocalId, item.ItemID); | 556 | if (m_part.ParentGroup.Scene != null) |
| 557 | m_part.ParentGroup.Scene.EventManager.TriggerStopScript(m_part.LocalId, item.ItemID); | ||
| 557 | 558 | ||
| 558 | // At the moment, even stopped scripts are counted as active, which is probably wrong. | 559 | // At the moment, even stopped scripts are counted as active, which is probably wrong. |
| 559 | // m_part.ParentGroup.AddActiveScriptCount(-1); | 560 | // m_part.ParentGroup.AddActiveScriptCount(-1); |