diff options
author | Justin Clark-Casey (justincc) | 2014-12-17 00:21:58 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-12-17 00:25:24 +0000 |
commit | e901253b49668f1e1d8f135f2d05aaec7baad40a (patch) | |
tree | 8a3459be6a167c3c406a0cff9886814622a0db73 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Add command to reset region's user cache (diff) | |
download | opensim-SC_OLD-e901253b49668f1e1d8f135f2d05aaec7baad40a.zip opensim-SC_OLD-e901253b49668f1e1d8f135f2d05aaec7baad40a.tar.gz opensim-SC_OLD-e901253b49668f1e1d8f135f2d05aaec7baad40a.tar.bz2 opensim-SC_OLD-e901253b49668f1e1d8f135f2d05aaec7baad40a.tar.xz |
Fix recent regression where a race condition meant SP.MakeRootAgent() would sometimes look to start attachment scripts before ETM.HandleIncomingSceneObject() had added them.
Probably a regression since ghosts branch merge on Nov 26 2014
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 93dfd00..0414f89 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1228,45 +1228,27 @@ namespace OpenSim.Region.Framework.Scenes | |||
1228 | 1228 | ||
1229 | m_scene.SwapRootAgentCount(false); | 1229 | m_scene.SwapRootAgentCount(false); |
1230 | 1230 | ||
1231 | // The initial login scene presence is already root when it gets here | 1231 | if (Scene.AttachmentsModule != null) |
1232 | // and it has already rezzed the attachments and started their scripts. | 1232 | { |
1233 | // We do the following only for non-login agents, because their scripts | 1233 | // The initial login scene presence is already root when it gets here |
1234 | // haven't started yet. | 1234 | // and it has already rezzed the attachments and started their scripts. |
1235 | if (PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags)) | 1235 | // We do the following only for non-login agents, because their scripts |
1236 | { | 1236 | // haven't started yet. |
1237 | // Viewers which have a current outfit folder will actually rez their own attachments. However, | 1237 | if (PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags)) |
1238 | // viewers without (e.g. v1 viewers) will not, so we still need to make this call. | ||
1239 | if (Scene.AttachmentsModule != null) | ||
1240 | { | 1238 | { |
1239 | // Viewers which have a current outfit folder will actually rez their own attachments. However, | ||
1240 | // viewers without (e.g. v1 viewers) will not, so we still need to make this call. | ||
1241 | WorkManager.RunJob( | 1241 | WorkManager.RunJob( |
1242 | "RezAttachments", | 1242 | "RezAttachments", |
1243 | o => Scene.AttachmentsModule.RezAttachments(this), | 1243 | o => Scene.AttachmentsModule.RezAttachments(this), |
1244 | null, | 1244 | null, |
1245 | string.Format("Rez attachments for {0} in {1}", Name, Scene.Name)); | 1245 | string.Format("Rez attachments for {0} in {1}", Name, Scene.Name)); |
1246 | } | 1246 | } |
1247 | } | 1247 | else |
1248 | else | ||
1249 | { | ||
1250 | // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT | ||
1251 | // and CHANGED_REGION) when the attachments have been rezzed in the new region. This cannot currently | ||
1252 | // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are | ||
1253 | // not transporting the required data. | ||
1254 | // | ||
1255 | // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of | ||
1256 | // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here | ||
1257 | // which needs to lock m_attachments. ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status. | ||
1258 | // | ||
1259 | // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts(). | ||
1260 | // But XEngine starts all scripts unsuspended. Starting them suspended will not currently work because script rezzing | ||
1261 | // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the | ||
1262 | // script is rezzed. This means the ResumeScripts() does absolutely nothing when using XEngine. | ||
1263 | List<SceneObjectGroup> attachments = GetAttachments(); | ||
1264 | |||
1265 | if (attachments.Count > 0) | ||
1266 | { | 1248 | { |
1267 | WorkManager.RunJob( | 1249 | WorkManager.RunJob( |
1268 | "StartAttachmentScripts", | 1250 | "StartAttachmentScripts", |
1269 | o => RestartAttachmentScripts(attachments), | 1251 | o => RestartAttachmentScripts(), |
1270 | null, | 1252 | null, |
1271 | string.Format("Start attachment scripts for {0} in {1}", Name, Scene.Name), | 1253 | string.Format("Start attachment scripts for {0} in {1}", Name, Scene.Name), |
1272 | true); | 1254 | true); |
@@ -1292,10 +1274,25 @@ namespace OpenSim.Region.Framework.Scenes | |||
1292 | return true; | 1274 | return true; |
1293 | } | 1275 | } |
1294 | 1276 | ||
1295 | private void RestartAttachmentScripts(List<SceneObjectGroup> attachments) | 1277 | private void RestartAttachmentScripts() |
1296 | { | 1278 | { |
1279 | // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT | ||
1280 | // and CHANGED_REGION) when the attachments have been rezzed in the new region. This cannot currently | ||
1281 | // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are | ||
1282 | // not transporting the required data. | ||
1283 | // | ||
1284 | // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of | ||
1285 | // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here | ||
1286 | // which needs to lock m_attachments. ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status. | ||
1287 | // | ||
1288 | // FIXME: In theory, this deadlock should not arise since scripts should not be processing events until ResumeScripts(). | ||
1289 | // But XEngine starts all scripts unsuspended. Starting them suspended will not currently work because script rezzing | ||
1290 | // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the | ||
1291 | // script is rezzed. This means the ResumeScripts() does absolutely nothing when using XEngine. | ||
1292 | List<SceneObjectGroup> attachments = GetAttachments(); | ||
1293 | |||
1297 | m_log.DebugFormat( | 1294 | m_log.DebugFormat( |
1298 | "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name); | 1295 | "[SCENE PRESENCE]: Restarting scripts in {0} attachments for {1} in {2}", attachments.Count, Name, Scene.Name); |
1299 | 1296 | ||
1300 | // Resume scripts | 1297 | // Resume scripts |
1301 | foreach (SceneObjectGroup sog in attachments) | 1298 | foreach (SceneObjectGroup sog in attachments) |