diff options
author | Melanie Thielker | 2010-04-19 19:27:45 +0200 |
---|---|---|
committer | Melanie | 2010-04-19 17:28:43 +0100 |
commit | af3e477e4b1cc6c1a2176d776e6c39d0c7fc457c (patch) | |
tree | f2ce3e1b6963fd79320c5ed094f1c89b13aa0790 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |
parent | Make script asset fetches synchronous. Script instantiation synchronization (diff) | |
download | opensim-SC_OLD-af3e477e4b1cc6c1a2176d776e6c39d0c7fc457c.zip opensim-SC_OLD-af3e477e4b1cc6c1a2176d776e6c39d0c7fc457c.tar.gz opensim-SC_OLD-af3e477e4b1cc6c1a2176d776e6c39d0c7fc457c.tar.bz2 opensim-SC_OLD-af3e477e4b1cc6c1a2176d776e6c39d0c7fc457c.tar.xz |
Avoid duplicate script resumes. Move resume calls to more logical places
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 32a0df9..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 | } |
@@ -621,7 +622,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
621 | } | 622 | } |
622 | } | 623 | } |
623 | 624 | ||
624 | rootPart.ParentGroup.ResumeScripts(); | ||
625 | return rootPart.ParentGroup; | 625 | return rootPart.ParentGroup; |
626 | } | 626 | } |
627 | } | 627 | } |