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/Avatar/Attachments | |
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/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 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 | ||