diff options
| author | Justin Clark-Casey (justincc) | 2010-04-19 21:28:30 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-19 21:28:30 +0100 |
| commit | 6b963e73d954b9ae8a6d283b5c83460d6a192ba6 (patch) | |
| tree | f7c3db7ccb54a27cdb4ed5d38645275792c56266 /OpenSim/Region/CoreModules | |
| parent | Make the "notecard saved" text appear in the saver rather than the notecard o... (diff) | |
| parent | Avoid duplicate script resumes. Move resume calls to more logical places (diff) | |
| download | opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.zip opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.gz opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.bz2 opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index c87a383..f050dcf 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -239,6 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 239 | // Fire after attach, so we don't get messy perms dialogs | 239 | // Fire after attach, so we don't get messy perms dialogs |
| 240 | // 3 == AttachedRez | 240 | // 3 == AttachedRez |
| 241 | objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3); | 241 | objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3); |
| 242 | objatt.ResumeScripts(); | ||
| 242 | 243 | ||
| 243 | // Do this last so that event listeners have access to all the effects of the attachment | 244 | // Do this last so that event listeners have access to all the effects of the attachment |
| 244 | m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId); | 245 | m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId); |
| @@ -413,4 +414,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 413 | } | 414 | } |
| 414 | } | 415 | } |
| 415 | } | 416 | } |
| 416 | } \ No newline at end of file | 417 | } |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 16e05b7..2352ced 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -601,6 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 601 | 601 | ||
| 602 | // Fire on_rez | 602 | // Fire on_rez |
| 603 | group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 0); | 603 | group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 0); |
| 604 | rootPart.ParentGroup.ResumeScripts(); | ||
| 604 | 605 | ||
| 605 | rootPart.ScheduleFullUpdate(); | 606 | rootPart.ScheduleFullUpdate(); |
| 606 | } | 607 | } |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 55028d0..c52f029 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -284,6 +284,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 284 | { | 284 | { |
| 285 | sceneObjectsLoadedCount++; | 285 | sceneObjectsLoadedCount++; |
| 286 | sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0); | 286 | sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0); |
| 287 | sceneObject.ResumeScripts(); | ||
| 287 | } | 288 | } |
| 288 | } | 289 | } |
| 289 | 290 | ||