Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 02:19:12 +00:00 · 2013-03-29 02:19:12 +00:00 · e7d76c91c2
parent 05810e48b0 285bd3abc8
commit e7d76c91c2
1 changed files with 0 additions and 21 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -1113,27 +1113,6 @@ namespace OpenSim.Region.Framework.Scenes
                            Scene.AttachmentsModule.RezAttachments(this); 
                        });
            }
-            else
-            {
-                lock (m_attachments)
-                {
-                    if (HasAttachments())
-                    {
-                        m_log.DebugFormat(
-                            "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
-                    
-                        // Resume scripts
-                        Util.FireAndForget(delegate(object x) {
-                            foreach (SceneObjectGroup sog in m_attachments)
-                            {
-                                sog.ScheduleGroupForFullUpdate();
-                                sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
-                                sog.ResumeScripts();
-                            }
-                        });
-                    }
-                }
-            }

            SendAvatarDataToAllAgents();