diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 442cc65ca5..f9f18c67ec 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 52cfd488cf..2b11f5c552 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 7edd75aaba..e0c556349c 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 c86a50e43b..dd83744996 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 cfc362cb17..017b294d6b 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); } } } diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs index f2ce064dc1..9880c91d18 100644 --- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs +++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs @@ -167,7 +167,7 @@ namespace OpenSim.Tests.Common AddEvent(receiverAgent, "AgentGroupDataUpdate", data); } - public OSD ScriptRunningEvent (UUID objectID, UUID itemID, bool running, bool mono) + public void ScriptRunningEvent (UUID objectID, UUID itemID, bool running, UUID avatarID) { Console.WriteLine("ONE"); throw new System.NotImplementedException ();