From af3e477e4b1cc6c1a2176d776e6c39d0c7fc457c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 19 Apr 2010 19:27:45 +0200
Subject: Avoid duplicate script resumes. Move resume calls to more logical
 places

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs      | 2 +-
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
                     // 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;
             }
             
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
                         
                         // 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;
                 }
             }
-- 
cgit v1.1