diff options
| author | Melanie Thielker | 2010-08-22 13:51:15 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-22 13:51:15 +0200 |
| commit | 071edaff491c318ba4164b4c4783e425222dc570 (patch) | |
| tree | 3dad82b524b49f61c35858b1552c2c78cfe8cec4 | |
| parent | A stab at making a better bounding box calculation (diff) | |
| download | opensim-SC-071edaff491c318ba4164b4c4783e425222dc570.zip opensim-SC-071edaff491c318ba4164b4c4783e425222dc570.tar.gz opensim-SC-071edaff491c318ba4164b4c4783e425222dc570.tar.bz2 opensim-SC-071edaff491c318ba4164b4c4783e425222dc570.tar.xz | |
Suppress error messages about scripts not foind if they're in fact disabled
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index abb4de6..a7003c4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -422,6 +422,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 422 | 422 | ||
| 423 | public void ResumeScripts() | 423 | public void ResumeScripts() |
| 424 | { | 424 | { |
| 425 | if (m_scene.RegionInfo.RegionSettings.DisableScripts) | ||
| 426 | return; | ||
| 427 | |||
| 425 | foreach (SceneObjectPart part in m_parts.Values) | 428 | foreach (SceneObjectPart part in m_parts.Values) |
| 426 | { | 429 | { |
| 427 | part.Inventory.ResumeScripts(); | 430 | part.Inventory.ResumeScripts(); |