From 95d9c773d94573026907d112a7ce82cf362bdd61 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Jul 2010 01:18:43 +0100
Subject: Stop occasional permanently high 100% utilization when the server is
 started with many scripts

See http://opensimulator.org/mantis/view.php?id=4799 for more details
This is the equivalent patch that was applied to master 3.5 weeks ago, seemingly without bad consequences
Thanks Snoopy!
---
 .../Framework/Scenes/SceneObjectPartInventory.cs   | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d175695..256e3b0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Collections;
 using System.Reflection;
+using System.Threading;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
@@ -201,6 +202,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if ((int)InventoryType.LSL == item.InvType)
                     {
                         CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
+                        Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug
                     }
                 }
             }
@@ -258,7 +260,7 @@ namespace OpenSim.Region.Framework.Scenes
             // m_log.InfoFormat(
             //     "[PRIM INVENTORY]: " +
             //     "Starting script {0}, {1} in prim {2}, {3}",
-            //     item.Name, item.ItemID, Name, UUID);
+            //     item.Name, item.ItemID, m_part.Name, m_part.UUID);
 
             if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
                 return;
@@ -296,20 +298,20 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         else
                         {
-                            if (m_part.ParentGroup.m_savedScriptState != null)
-                                RestoreSavedScriptState(item.OldItemID, item.ItemID);
-
                             lock (m_items)
                             {
+                                if (m_part.ParentGroup.m_savedScriptState != null)
+                                    RestoreSavedScriptState(item.OldItemID, item.ItemID);
+
                                 m_items[item.ItemID].PermsMask = 0;
                                 m_items[item.ItemID].PermsGranter = UUID.Zero;
+
+                                string script = Utils.BytesToString(asset.Data);
+                                m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
+                                    m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
+                                m_part.ParentGroup.AddActiveScriptCount(1);
+                                m_part.ScheduleFullUpdate();
                             }
-                        
-                            string script = Utils.BytesToString(asset.Data);
-                            m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
-                                m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
-                            m_part.ParentGroup.AddActiveScriptCount(1);
-                            m_part.ScheduleFullUpdate();
                         }
                     }
                 );
-- 
cgit v1.1