aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie2012-03-26 14:19:55 +0100
committerMelanie2012-03-26 14:19:55 +0100
commit7e0936e4b6ec0596390266a8435dea9c3f19f09c (patch)
tree7da6768edda1ccbecab7fe4e632c3cfb07114c4d /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentFix the omission on the interface declaration (diff)
downloadopensim-SC-7e0936e4b6ec0596390266a8435dea9c3f19f09c.zip
opensim-SC-7e0936e4b6ec0596390266a8435dea9c3f19f09c.tar.gz
opensim-SC-7e0936e4b6ec0596390266a8435dea9c3f19f09c.tar.bz2
opensim-SC-7e0936e4b6ec0596390266a8435dea9c3f19f09c.tar.xz
Add a hust UUID to the script invocations
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 1bcbcd3..7c07e15 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -122,6 +122,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
122 /// <param name="fname">The name of the function to invoke</param> 122 /// <param name="fname">The name of the function to invoke</param>
123 /// <param name="parms">List of parameters</param> 123 /// <param name="parms">List of parameters</param>
124 /// <returns>string result of the invocation</returns> 124 /// <returns>string result of the invocation</returns>
125 public void modInvokeN(string fname, params object[] parms)
126 {
127 Type returntype = m_comms.LookupReturnType(fname);
128 if (returntype != typeof(string))
129 MODError(String.Format("return type mismatch for {0}",fname));
130
131 modInvoke(fname,parms);
132 }
133
125 public LSL_String modInvokeS(string fname, params object[] parms) 134 public LSL_String modInvokeS(string fname, params object[] parms)
126 { 135 {
127 Type returntype = m_comms.LookupReturnType(fname); 136 Type returntype = m_comms.LookupReturnType(fname);
@@ -243,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
243 // non-null but don't trust it completely 252 // non-null but don't trust it completely
244 try 253 try
245 { 254 {
246 object result = m_comms.InvokeOperation(m_itemID,fname,convertedParms); 255 object result = m_comms.InvokeOperation(m_host.UUID, m_itemID, fname, convertedParms);
247 if (result != null) 256 if (result != null)
248 return result; 257 return result;
249 258