From 9fb3065d336d1907b5946c30010c9066e99e7597 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Sep 2014 18:26:41 +0100
Subject: Temporarily add root agent rez attachments work to job engine if it
 is running rather than as a fire and forget.

Experiment to see if serializing attachment rez and send initial data jobs improves other parts of sim performance.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2718785..afe6daa 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1228,10 +1228,14 @@ namespace OpenSim.Region.Framework.Scenes
                 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
                 if (Scene.AttachmentsModule != null)
                 {
-                    Util.FireAndForget(o =>
-                    {
-                        Scene.AttachmentsModule.RezAttachments(this);
-                    });
+                    if (Watchdog.JobEngine.IsRunning)
+                        Watchdog.RunWhenPossible(
+                            "RezAttachments", 
+                            o => Scene.AttachmentsModule.RezAttachments(this), 
+                            string.Format("Rez attachments for {0} in {1}", Name, Scene.Name), 
+                            null);
+                    else
+                        Util.FireAndForget(o => Scene.AttachmentsModule.RezAttachments(this));
                 }
             }
             else
-- 
cgit v1.1