diff options
| author | meta7 | 2010-08-22 09:32:49 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-22 09:32:49 -0700 |
| commit | 8a1640f0a1838a0cfc05ec6bab6d5d6166fde221 (patch) | |
| tree | 94c0d096eb9889f425269a926ef2090590f75ae7 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
| parent | Fix llGetLinkKey and llGetNumberOfPrims to play nice with avatars in the link... (diff) | |
| parent | Refix the fix (diff) | |
| download | opensim-SC-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.zip opensim-SC-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.tar.gz opensim-SC-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.tar.bz2 opensim-SC-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
| -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(); |