diff options
author | Homer Horwitz | 2008-10-16 21:46:03 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-10-16 21:46:03 +0000 |
commit | ae9e38bf3fdc27144e0f3fa377c60506526e4c13 (patch) | |
tree | db9515714c731464576c415d8d37021abbe9f469 /OpenSim/Region/ScriptEngine | |
parent | Split the currency module into currency and a new Combat module, because (diff) | |
download | opensim-SC_OLD-ae9e38bf3fdc27144e0f3fa377c60506526e4c13.zip opensim-SC_OLD-ae9e38bf3fdc27144e0f3fa377c60506526e4c13.tar.gz opensim-SC_OLD-ae9e38bf3fdc27144e0f3fa377c60506526e4c13.tar.bz2 opensim-SC_OLD-ae9e38bf3fdc27144e0f3fa377c60506526e4c13.tar.xz |
Fixed (mono-)script handling for SL viewer 1.21:
- Added two missing caps (UpdateScriptAgent, UpdateScriptTask)
- Added one missing EventQueue event (ScriptRunningReply)
- Changed DNE and XEngine to use this new event
As we only use the mono engine anyway, the "Mono" checkbox is set by
default but doesn't have any function.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 13 |
2 files changed, 23 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 1c1d42f..d3269e1 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -32,6 +32,7 @@ using log4net; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Region.Interfaces; | 33 | using OpenSim.Region.Interfaces; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Environment; | ||
35 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
37 | using OpenSim.Region.ScriptEngine.Interfaces; | 38 | using OpenSim.Region.ScriptEngine.Interfaces; |
@@ -369,8 +370,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
369 | if (id == null) | 370 | if (id == null) |
370 | return; | 371 | return; |
371 | 372 | ||
372 | controllingClient.SendScriptRunningReply(objectID, itemID, | 373 | IEventQueue eq = World.RequestModuleInterface<IEventQueue>(); |
373 | id.Running); | 374 | if (eq == null) |
375 | { | ||
376 | controllingClient.SendScriptRunningReply(objectID, itemID, | ||
377 | id.Running); | ||
378 | } | ||
379 | else | ||
380 | { | ||
381 | eq.Enqueue(EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, id.Running, true), | ||
382 | controllingClient.AgentId); | ||
383 | } | ||
374 | } | 384 | } |
375 | 385 | ||
376 | public IScriptApi GetApi(UUID itemID, string name) | 386 | public IScriptApi GetApi(UUID itemID, string name) |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 9b78d53..86dc824 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -972,8 +972,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
972 | IScriptInstance instance = GetInstance(itemID); | 972 | IScriptInstance instance = GetInstance(itemID); |
973 | if (instance == null) | 973 | if (instance == null) |
974 | return; | 974 | return; |
975 | controllingClient.SendScriptRunningReply(objectID, itemID, | 975 | IEventQueue eq = World.RequestModuleInterface<IEventQueue>(); |
976 | GetScriptState(itemID)); | 976 | if (eq == null) |
977 | { | ||
978 | controllingClient.SendScriptRunningReply(objectID, itemID, | ||
979 | GetScriptState(itemID)); | ||
980 | } | ||
981 | else | ||
982 | { | ||
983 | eq.Enqueue(EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, GetScriptState(itemID), true), | ||
984 | controllingClient.AgentId); | ||
985 | } | ||
977 | } | 986 | } |
978 | } | 987 | } |
979 | } | 988 | } |