diff options
author | Justin Clark-Casey (justincc) | 2013-03-29 00:49:55 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-29 00:49:55 +0000 |
commit | 285bd3abc87aced43efa9519a5760d9dae3f50d9 (patch) | |
tree | 378d9eb2992014666d9c01b43700171bd6ad2e53 /OpenSim/Region/Framework/Scenes | |
parent | Stop attempts to update/add existing attachments in user inventory when telep... (diff) | |
download | opensim-SC_OLD-285bd3abc87aced43efa9519a5760d9dae3f50d9.zip opensim-SC_OLD-285bd3abc87aced43efa9519a5760d9dae3f50d9.tar.gz opensim-SC_OLD-285bd3abc87aced43efa9519a5760d9dae3f50d9.tar.bz2 opensim-SC_OLD-285bd3abc87aced43efa9519a5760d9dae3f50d9.tar.xz |
Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fcb2f6d..6591fef 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -968,24 +968,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
968 | Scene.AttachmentsModule.RezAttachments(this); | 968 | Scene.AttachmentsModule.RezAttachments(this); |
969 | }); | 969 | }); |
970 | } | 970 | } |
971 | else | ||
972 | { | ||
973 | lock (m_attachments) | ||
974 | { | ||
975 | if (HasAttachments()) | ||
976 | { | ||
977 | m_log.DebugFormat( | ||
978 | "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name); | ||
979 | |||
980 | // Resume scripts | ||
981 | foreach (SceneObjectGroup sog in m_attachments) | ||
982 | { | ||
983 | sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); | ||
984 | sog.ResumeScripts(); | ||
985 | } | ||
986 | } | ||
987 | } | ||
988 | } | ||
989 | 971 | ||
990 | // send the animations of the other presences to me | 972 | // send the animations of the other presences to me |
991 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) | 973 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) |