diff options
author | Melanie Thielker | 2009-04-10 21:08:33 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-04-10 21:08:33 +0000 |
commit | 8902923b12718399edf7b6bf39ea0ff37002ae24 (patch) | |
tree | c9653ecff6ca48935438ea944e695e1503f7ffc5 /OpenSim/Region/ScriptEngine/XEngine | |
parent | Expose the XMLRPC listener port on the IXMLRPC interface to allow (diff) | |
download | opensim-SC_OLD-8902923b12718399edf7b6bf39ea0ff37002ae24.zip opensim-SC_OLD-8902923b12718399edf7b6bf39ea0ff37002ae24.tar.gz opensim-SC_OLD-8902923b12718399edf7b6bf39ea0ff37002ae24.tar.bz2 opensim-SC_OLD-8902923b12718399edf7b6bf39ea0ff37002ae24.tar.xz |
Introduce IXmlRpcRouter, an interface that allows registering XMLRPC
UUIDs with a central marshaller for grids, or publish the ULS for objects
elsewhere.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 357ee32..a78dad6 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -78,6 +78,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
78 | #pragma warning disable 414 | 78 | #pragma warning disable 414 |
79 | private EventManager m_EventManager; | 79 | private EventManager m_EventManager; |
80 | #pragma warning restore 414 | 80 | #pragma warning restore 414 |
81 | private IXmlRpcRouter m_XmlRpcRouter; | ||
81 | private int m_EventLimit; | 82 | private int m_EventLimit; |
82 | private bool m_KillTimedOutScripts; | 83 | private bool m_KillTimedOutScripts; |
83 | 84 | ||
@@ -130,6 +131,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
130 | get { return m_ScriptEngines; } | 131 | get { return m_ScriptEngines; } |
131 | } | 132 | } |
132 | 133 | ||
134 | public IScriptModule ScriptModule | ||
135 | { | ||
136 | get { return this; } | ||
137 | } | ||
138 | |||
133 | // private struct RezScriptParms | 139 | // private struct RezScriptParms |
134 | // { | 140 | // { |
135 | // uint LocalID; | 141 | // uint LocalID; |
@@ -222,6 +228,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
222 | m_MaxScriptQueue, m_StackSize); | 228 | m_MaxScriptQueue, m_StackSize); |
223 | 229 | ||
224 | m_Scene.StackModuleInterface<IScriptModule>(this); | 230 | m_Scene.StackModuleInterface<IScriptModule>(this); |
231 | |||
232 | m_XmlRpcRouter = m_Scene.RequestModuleInterface<IXmlRpcRouter>(); | ||
233 | if (m_XmlRpcRouter != null) | ||
234 | { | ||
235 | OnScriptRemoved += m_XmlRpcRouter.ScriptRemoved; | ||
236 | OnObjectRemoved += m_XmlRpcRouter.ObjectRemoved; | ||
237 | } | ||
225 | } | 238 | } |
226 | 239 | ||
227 | public void PostInitialise() | 240 | public void PostInitialise() |
@@ -917,6 +930,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
917 | return false; | 930 | return false; |
918 | } | 931 | } |
919 | 932 | ||
933 | public bool PostScriptEvent(UUID itemID, string name, Object[] p) | ||
934 | { | ||
935 | return PostScriptEvent(itemID, new EventParams(name, p, new DetectParams[0])); | ||
936 | } | ||
937 | |||
920 | public Assembly OnAssemblyResolve(object sender, | 938 | public Assembly OnAssemblyResolve(object sender, |
921 | ResolveEventArgs args) | 939 | ResolveEventArgs args) |
922 | { | 940 | { |