diff options
Diffstat (limited to '')
6 files changed, 9 insertions, 12 deletions
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 | |||
594 | Enqueue(item, avatarID); | 594 | Enqueue(item, avatarID); |
595 | } | 595 | } |
596 | 596 | ||
597 | public OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono) | 597 | public OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, UUID avatarID) |
598 | { | 598 | { |
599 | return EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, running, mono); | 599 | return EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, running); |
600 | } | 600 | } |
601 | 601 | ||
602 | public OSD BuildEvent(string eventName, OSD eventBody) | 602 | 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 | |||
187 | return BuildEvent("TeleportFinish", body); | 187 | return BuildEvent("TeleportFinish", body); |
188 | } | 188 | } |
189 | 189 | ||
190 | public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running, bool mono) | 190 | public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running) |
191 | { | 191 | { |
192 | OSDMap script = new OSDMap(); | 192 | OSDMap script = new OSDMap(); |
193 | script.Add("ObjectID", OSD.FromUUID(objectID)); | 193 | script.Add("ObjectID", OSD.FromUUID(objectID)); |
194 | script.Add("ItemID", OSD.FromUUID(itemID)); | 194 | script.Add("ItemID", OSD.FromUUID(itemID)); |
195 | script.Add("Running", OSD.FromBoolean(running)); | 195 | script.Add("Running", OSD.FromBoolean(running)); |
196 | script.Add("Mono", OSD.FromBoolean(mono)); | 196 | script.Add("Mono", OSD.FromBoolean(true)); |
197 | 197 | ||
198 | OSDArray scriptArr = new OSDArray(); | 198 | OSDArray scriptArr = new OSDArray(); |
199 | scriptArr.Add(script); | 199 | 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 | |||
60 | void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason); | 60 | void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason); |
61 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); | 61 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
62 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); | 62 | void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); |
63 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); | 63 | void ScriptRunningEvent(UUID objectID, UUID itemID, bool running, UUID avatarID); |
64 | OSD BuildEvent(string eventName, OSD eventBody); | 64 | OSD BuildEvent(string eventName, OSD eventBody); |
65 | void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID); | 65 | void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID); |
66 | 66 | ||
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 | |||
2079 | } | 2079 | } |
2080 | else | 2080 | else |
2081 | { | 2081 | { |
2082 | eq.Enqueue(eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), true), | 2082 | eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), controllingClient.AgentId); |
2083 | controllingClient.AgentId); | ||
2084 | } | 2083 | } |
2085 | } | 2084 | } |
2086 | 2085 | ||
@@ -2236,7 +2235,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
2236 | 2235 | ||
2237 | stateData.AppendChild(mapData); | 2236 | stateData.AppendChild(mapData); |
2238 | 2237 | ||
2239 | // m_log.DebugFormat("[XEngine]: Got XML state for {0}", itemID); | 2238 | // m_log.DebugFormat("[XEngine]: Got XML state for {0}", itemID); |
2240 | 2239 | ||
2241 | return doc.InnerXml; | 2240 | return doc.InnerXml; |
2242 | } | 2241 | } |
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 | |||
1467 | } | 1467 | } |
1468 | else | 1468 | else |
1469 | { | 1469 | { |
1470 | eq.Enqueue(EventQueueHelper.ScriptRunningReplyEvent(objectID, | 1470 | eq.ScriptRunningEvent(objectID, itemID, instance.Running, controllingClient.AgentId); |
1471 | itemID, instance.Running, true), | ||
1472 | controllingClient.AgentId); | ||
1473 | } | 1471 | } |
1474 | } | 1472 | } |
1475 | } | 1473 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs index f2ce064..9880c91 100644 --- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs +++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | |||
@@ -167,7 +167,7 @@ namespace OpenSim.Tests.Common | |||
167 | AddEvent(receiverAgent, "AgentGroupDataUpdate", data); | 167 | AddEvent(receiverAgent, "AgentGroupDataUpdate", data); |
168 | } | 168 | } |
169 | 169 | ||
170 | public OSD ScriptRunningEvent (UUID objectID, UUID itemID, bool running, bool mono) | 170 | public void ScriptRunningEvent (UUID objectID, UUID itemID, bool running, UUID avatarID) |
171 | { | 171 | { |
172 | Console.WriteLine("ONE"); | 172 | Console.WriteLine("ONE"); |
173 | throw new System.NotImplementedException (); | 173 | throw new System.NotImplementedException (); |