1 files changed, 7 insertions, 6 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index c2ec5b4..0605590 100644
--- a/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -161,13 +161,13 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
             lock (m_scriptInvocation)
             {
                 ParameterInfo[] parameters = fcall.Method.GetParameters ();
-                if (parameters.Length == 0) // Must have one UUID param
+                if (parameters.Length < 2) // Must have two UUID params
                     return;
 
-                // Hide the first parameter
-                Type[] parmTypes = new Type[parameters.Length - 1];
-                for (int i = 1 ; i < parameters.Length ; i++)
-                    parmTypes[i - 1] = parameters[i].ParameterType;
+                // Hide the first two parameters
+                Type[] parmTypes = new Type[parameters.Length - 2];
+                for (int i = 2 ; i < parameters.Length ; i++)
+                    parmTypes[i - 2] = parameters[i].ParameterType;
                 m_scriptInvocation[fcall.Method.Name] = new ScriptInvocationData(fcall.Method.Name, fcall, parmTypes, fcall.Method.ReturnType);
             }
         }
@@ -249,9 +249,10 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
             return null;
         }
 
-        public object InvokeOperation(UUID scriptid, string fname, params object[] parms)
+        public object InvokeOperation(UUID hostid, UUID scriptid, string fname, params object[] parms)
         {
             List<object> olist = new List<object>();
+            olist.Add(hostid);
             olist.Add(scriptid);
             foreach (object o in parms)
                 olist.Add(o);