aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorOren Hurvitz2014-01-29 16:14:27 +0200
committerOren Hurvitz2014-03-25 08:01:55 +0100
commite131e73652cf6ed2407e41c7d83dc67f49ca23ee (patch)
treee0d8573e47c8edd7f2effca8d4177bc57bd10a26 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentChanged LogThreadPool to have 4 logging levels. Added console command "debug ... (diff)
downloadopensim-SC-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.zip
opensim-SC-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.gz
opensim-SC-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.bz2
opensim-SC-e131e73652cf6ed2407e41c7d83dc67f49ca23ee.tar.xz
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
Resolves http://opensimulator.org/mantis/view.php?id=6945
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 64c464d..080cdb4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3201,7 +3201,7 @@ namespace OpenSim.Region.Framework.Scenes
3201 public void SendInitialDataToMe() 3201 public void SendInitialDataToMe()
3202 { 3202 {
3203 // Send all scene object to the new client 3203 // Send all scene object to the new client
3204 Util.FireAndForget(delegate 3204 Util.RunThreadNoTimeout(delegate
3205 { 3205 {
3206 // we created a new ScenePresence (a new child agent) in a fresh region. 3206 // we created a new ScenePresence (a new child agent) in a fresh region.
3207 // Request info about all the (root) agents in this region 3207 // Request info about all the (root) agents in this region
@@ -3216,7 +3216,7 @@ namespace OpenSim.Region.Framework.Scenes
3216 ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient); 3216 ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
3217 } 3217 }
3218 3218
3219 }); 3219 }, "SendInitialDataToMe", null);
3220 } 3220 }
3221 3221
3222 /// <summary> 3222 /// <summary>