aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-04-19 19:27:45 +0200
committerMelanie2010-04-19 17:28:43 +0100
commitaf3e477e4b1cc6c1a2176d776e6c39d0c7fc457c (patch)
treef2ce3e1b6963fd79320c5ed094f1c89b13aa0790
parentMake script asset fetches synchronous. Script instantiation synchronization (diff)
downloadopensim-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
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 77e73fb..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);
@@ -250,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
250 itemID, remoteClient.Name, AttachmentPt); 251 itemID, remoteClient.Name, AttachmentPt);
251 } 252 }
252 253
253 objatt.ResumeScripts();
254 return objatt; 254 return objatt;
255 } 255 }
256 256
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 }