aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2019-01-25 21:35:23 +0000
committerUbitUmarov2019-01-25 21:35:23 +0000
commitf7926eb28c45969dde1b0be3cb7e9739319dd7e9 (patch)
treecc33bd20a32059730dcb6607e051f8f34c417190 /OpenSim/Region
parentscript mono is meaningless for us (diff)
downloadopensim-SC-f7926eb28c45969dde1b0be3cb7e9739319dd7e9.zip
opensim-SC-f7926eb28c45969dde1b0be3cb7e9739319dd7e9.tar.gz
opensim-SC-f7926eb28c45969dde1b0be3cb7e9739319dd7e9.tar.bz2
opensim-SC-f7926eb28c45969dde1b0be3cb7e9739319dd7e9.tar.xz
ok take the all change
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs17
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs17
2 files changed, 15 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index f9f18c6..4da4412 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -594,9 +594,22 @@ 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, UUID avatarID) 597 public void ScriptRunningEvent(UUID objectID, UUID itemID, bool running, UUID avatarID)
598 { 598 {
599 return EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, running); 599 StringBuilder sb = EventQueueHelper.StartEvent("ScriptRunningReply");
600 LLSDxmlEncode.AddArray("Script", sb);
601
602 LLSDxmlEncode.AddMap(sb);
603 LLSDxmlEncode.AddElem("ObjectID", objectID, sb);
604 LLSDxmlEncode.AddElem("ItemID", itemID, sb);
605 LLSDxmlEncode.AddElem("Running", running, sb);
606 LLSDxmlEncode.AddElem("Mono", true, sb);
607 LLSDxmlEncode.AddEndMap(sb);
608
609 LLSDxmlEncode.AddEndArray(sb);
610
611 OSDllsdxml item = new OSDllsdxml(EventQueueHelper.EndEvent(sb));
612 Enqueue(item, avatarID);
600 } 613 }
601 614
602 public OSD BuildEvent(string eventName, OSD eventBody) 615 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 2b11f5c..6f392d5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -187,23 +187,6 @@ 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)
191 {
192 OSDMap script = new OSDMap();
193 script.Add("ObjectID", OSD.FromUUID(objectID));
194 script.Add("ItemID", OSD.FromUUID(itemID));
195 script.Add("Running", OSD.FromBoolean(running));
196 script.Add("Mono", OSD.FromBoolean(true));
197
198 OSDArray scriptArr = new OSDArray();
199 scriptArr.Add(script);
200
201 OSDMap body = new OSDMap();
202 body.Add("Script", scriptArr);
203
204 return BuildEvent("ScriptRunningReply", body);
205 }
206
207 public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap, 190 public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap,
208 ulong regionHandle, int regionSizeX, int regionSizeY) 191 ulong regionHandle, int regionSizeX, int regionSizeY)
209 { 192 {