diff options
author | Melanie | 2013-03-29 02:19:12 +0000 |
---|---|---|
committer | Melanie | 2013-03-29 02:19:12 +0000 |
commit | e7d76c91c227ccd40af5067d28b5f08dfbcbc093 (patch) | |
tree | b7f91898700fe85567a4ba1c9783631daafd3a2b /OpenSim/Region | |
parent | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster (diff) | |
parent | Eliminate code which tries to restart attachment scripts in ScenePresence.Mak... (diff) | |
download | opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.zip opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.gz opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.bz2 opensim-SC-e7d76c91c227ccd40af5067d28b5f08dfbcbc093.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 486a075..d41325c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1113,27 +1113,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1113 | Scene.AttachmentsModule.RezAttachments(this); | 1113 | Scene.AttachmentsModule.RezAttachments(this); |
1114 | }); | 1114 | }); |
1115 | } | 1115 | } |
1116 | else | ||
1117 | { | ||
1118 | lock (m_attachments) | ||
1119 | { | ||
1120 | if (HasAttachments()) | ||
1121 | { | ||
1122 | m_log.DebugFormat( | ||
1123 | "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name); | ||
1124 | |||
1125 | // Resume scripts | ||
1126 | Util.FireAndForget(delegate(object x) { | ||
1127 | foreach (SceneObjectGroup sog in m_attachments) | ||
1128 | { | ||
1129 | sog.ScheduleGroupForFullUpdate(); | ||
1130 | sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); | ||
1131 | sog.ResumeScripts(); | ||
1132 | } | ||
1133 | }); | ||
1134 | } | ||
1135 | } | ||
1136 | } | ||
1137 | 1116 | ||
1138 | SendAvatarDataToAllAgents(); | 1117 | SendAvatarDataToAllAgents(); |
1139 | 1118 | ||