Avoid duplicate script resumes. Move resume calls to more logical places
parent
3e63ce6d9d
commit
af3e477e4b
|
@ -239,6 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
|
|||
// Fire after attach, so we don't get messy perms dialogs
|
||||
// 3 == AttachedRez
|
||||
objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 3);
|
||||
objatt.ResumeScripts();
|
||||
|
||||
// Do this last so that event listeners have access to all the effects of the attachment
|
||||
m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
|
||||
|
@ -250,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
|
|||
itemID, remoteClient.Name, AttachmentPt);
|
||||
}
|
||||
|
||||
objatt.ResumeScripts();
|
||||
return objatt;
|
||||
}
|
||||
|
||||
|
|
|
@ -601,6 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
|||
|
||||
// Fire on_rez
|
||||
group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 0);
|
||||
rootPart.ParentGroup.ResumeScripts();
|
||||
|
||||
rootPart.ScheduleFullUpdate();
|
||||
}
|
||||
|
@ -621,7 +622,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
|
|||
}
|
||||
}
|
||||
|
||||
rootPart.ParentGroup.ResumeScripts();
|
||||
return rootPart.ParentGroup;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue