aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
2 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index bfa3b9a..9db5309 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -226,7 +226,10 @@ namespace OpenSim.Region.Framework.Scenes
226 // We must take a copy here since handle is acts like a reference when used in an iterator. 226 // We must take a copy here since handle is acts like a reference when used in an iterator.
227 // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region. 227 // This leads to race conditions if directly passed to SendCloseChildAgent with more than one neighbour region.
228 ulong handleCopy = handle; 228 ulong handleCopy = handle;
229 Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy, auth_code); }); 229 Util.FireAndForget(
230 o => SendCloseChildAgent(agentID, handleCopy, auth_code),
231 null,
232 "SceneCommunicationService.SendCloseChildAgentConnections");
230 } 233 }
231 } 234 }
232 235
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9481f71..1d234e2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1235,7 +1235,8 @@ namespace OpenSim.Region.Framework.Scenes
1235 string.Format("Rez attachments for {0} in {1}", Name, Scene.Name), 1235 string.Format("Rez attachments for {0} in {1}", Name, Scene.Name),
1236 null); 1236 null);
1237 else 1237 else
1238 Util.FireAndForget(o => Scene.AttachmentsModule.RezAttachments(this)); 1238 Util.FireAndForget(
1239 o => Scene.AttachmentsModule.RezAttachments(this), null, "ScenePresence.RezAttachmentsOnLogin");
1239 } 1240 }
1240 } 1241 }
1241 else 1242 else
@@ -1338,7 +1339,7 @@ namespace OpenSim.Region.Framework.Scenes
1338 1339
1339 UseFakeGroupTitle = false; 1340 UseFakeGroupTitle = false;
1340 SendAvatarDataToAllClients(false); 1341 SendAvatarDataToAllClients(false);
1341 }); 1342 }, null, "Scenepresence.ForceViewersUpdateName");
1342 } 1343 }
1343 1344
1344 public int GetStateSource() 1345 public int GetStateSource()
@@ -3645,7 +3646,8 @@ namespace OpenSim.Region.Framework.Scenes
3645 agentpos.CopyFrom(cadu, ControllingClient.SessionId); 3646 agentpos.CopyFrom(cadu, ControllingClient.SessionId);
3646 3647
3647 // Let's get this out of the update loop 3648 // Let's get this out of the update loop
3648 Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); }); 3649 Util.FireAndForget(
3650 o => m_scene.SendOutChildAgentUpdates(agentpos, this), null, "ScenePresence.SendOutChildAgentUpdates");
3649 } 3651 }
3650 } 3652 }
3651 3653
@@ -4515,7 +4517,7 @@ namespace OpenSim.Region.Framework.Scenes
4515 } 4517 }
4516 } 4518 }
4517 } 4519 }
4518 }); 4520 }, null, "ScenePresence.SendScriptEventToAttachments");
4519 } 4521 }
4520 4522
4521 /// <summary> 4523 /// <summary>