From 367bd48d9133ae2d60dd63c3c9fa7acb747a7d20 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 25 Jan 2019 21:21:23 +0000
Subject: script mono is meaningless for us

---
 .../Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 4 ++--
 .../Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs    | 4 ++--
 OpenSim/Region/Framework/Interfaces/IEventQueue.cs                   | 2 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs                       | 5 ++---
 OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs                     | 4 +---
 5 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 442cc65..f9f18c6 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -594,9 +594,9 @@ namespace OpenSim.Region.ClientStack.Linden
             Enqueue(item, avatarID);
         }
 
-        public OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono)
+        public OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, UUID avatarID)
         {
-            return EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, running, mono);
+            return EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, running);
         }
 
         public OSD BuildEvent(string eventName, OSD eventBody)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index 52cfd48..2b11f5c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -187,13 +187,13 @@ namespace OpenSim.Region.ClientStack.Linden
             return BuildEvent("TeleportFinish", body);
         }
 
-        public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running, bool mono)
+        public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running)
         {
             OSDMap script = new OSDMap();
             script.Add("ObjectID", OSD.FromUUID(objectID));
             script.Add("ItemID", OSD.FromUUID(itemID));
             script.Add("Running", OSD.FromBoolean(running));
-            script.Add("Mono", OSD.FromBoolean(mono));
+            script.Add("Mono", OSD.FromBoolean(true));
 
             OSDArray scriptArr = new OSDArray();
             scriptArr.Add(script);
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 7edd75a..e0c5563 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason);
         void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
         void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data);
-        OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono);
+        void ScriptRunningEvent(UUID objectID, UUID itemID, bool running, UUID avatarID);
         OSD BuildEvent(string eventName, OSD eventBody);
         void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID);
 
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c86a50e..dd83744 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -2079,8 +2079,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
             else
             {
-                eq.Enqueue(eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), true),
-                           controllingClient.AgentId);
+                eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), controllingClient.AgentId);
             }
         }
 
@@ -2236,7 +2235,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             stateData.AppendChild(mapData);
 
-//            m_log.DebugFormat("[XEngine]: Got XML state for {0}", itemID);
+            // m_log.DebugFormat("[XEngine]: Got XML state for {0}", itemID);
 
             return doc.InnerXml;
         }
diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
index cfc362c..017b294 100644
--- a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
+++ b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
@@ -1467,9 +1467,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                 }
                 else
                 {
-                    eq.Enqueue(EventQueueHelper.ScriptRunningReplyEvent(objectID,
-                            itemID, instance.Running, true),
-                            controllingClient.AgentId);
+                    eq.ScriptRunningEvent(objectID, itemID, instance.Running, controllingClient.AgentId);
                 }
             }
         }
-- 
cgit v1.1