aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments
diff options
context:
space:
mode:
authorMelanie Thielker2010-04-19 19:27:45 +0200
committerMelanie Thielker2010-04-19 19:27:45 +0200
commitde63b60748e33fb5089a463b7a114bb2de33bb5f (patch)
tree286a61acf1e27e3479b234a2636fca7aec5f09b9 /OpenSim/Region/CoreModules/Avatar/Attachments
parentRemove the event trigger for the attach event from the attachment module. (diff)
downloadopensim-SC_OLD-de63b60748e33fb5089a463b7a114bb2de33bb5f.zip
opensim-SC_OLD-de63b60748e33fb5089a463b7a114bb2de33bb5f.tar.gz
opensim-SC_OLD-de63b60748e33fb5089a463b7a114bb2de33bb5f.tar.bz2
opensim-SC_OLD-de63b60748e33fb5089a463b7a114bb2de33bb5f.tar.xz
Avoid duplicate script resumes. Move resume calls to more logical places
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
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 9178a0e..354994b 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