OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

script mono is meaningless for us

0.9.1.0-post-fixes
UbitUmarov 2019-01-25 21:21:23 +00:00
parent df568b1a66
commit 367bd48d91
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -594,9 +594,9 @@ namespace OpenSim.Region.ClientStack.Linden
Enqueue(item, avatarID); 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) public OSD BuildEvent(string eventName, OSD eventBody)

4
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
View File

@ -187,13 +187,13 @@ namespace OpenSim.Region.ClientStack.Linden
return BuildEvent("TeleportFinish", body); 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(); OSDMap script = new OSDMap();
script.Add("ObjectID", OSD.FromUUID(objectID)); script.Add("ObjectID", OSD.FromUUID(objectID));
script.Add("ItemID", OSD.FromUUID(itemID)); script.Add("ItemID", OSD.FromUUID(itemID));
script.Add("Running", OSD.FromBoolean(running)); script.Add("Running", OSD.FromBoolean(running));
script.Add("Mono", OSD.FromBoolean(mono)); script.Add("Mono", OSD.FromBoolean(true));
OSDArray scriptArr = new OSDArray(); OSDArray scriptArr = new OSDArray();
scriptArr.Add(script); scriptArr.Add(script);

2
OpenSim/Region/Framework/Interfaces/IEventQueue.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason); void ChatterBoxForceClose(UUID toAgent, UUID sessionID, string reason);
void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
void GroupMembershipData(UUID receiverAgent, GroupMembershipData[] data); 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); OSD BuildEvent(string eventName, OSD eventBody);
void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID); void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID);

5
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -2079,8 +2079,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
} }
else else
{ {
eq.Enqueue(eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), true), eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), controllingClient.AgentId);
controllingClient.AgentId);
} }
} }
@ -2236,7 +2235,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
stateData.AppendChild(mapData); 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; return doc.InnerXml;
} }

4
OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
View File

@ -1467,9 +1467,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
} }
else else
{ {
eq.Enqueue(EventQueueHelper.ScriptRunningReplyEvent(objectID, eq.ScriptRunningEvent(objectID, itemID, instance.Running, controllingClient.AgentId);
itemID, instance.Running, true),
controllingClient.AgentId);
} }
} }
} }

2
OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
View File

@ -167,7 +167,7 @@ namespace OpenSim.Tests.Common
AddEvent(receiverAgent, "AgentGroupDataUpdate", data); 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"); Console.WriteLine("ONE");
throw new System.NotImplementedException (); throw new System.NotImplementedException ();