From cb44808504e48125d630823880ee8e710afcd9ea Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 25 Mar 2012 19:52:38 +0100
Subject: Simplify the module invocation registration. The types and method
 name can be pulled fromt he delegate so we don't need to pass them explicitly

---
 OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index bb4c788..8bfbbf8 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -46,7 +46,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         event ScriptCommand OnScriptCommand;
 
-        void RegisterScriptInvocation(string name, ScriptInvocation fn, Type[] csig, Type rsig);
+        void RegisterScriptInvocation(ScriptInvocation fn);
+        ScriptInvocation[] GetScriptInvocationList();
 
         ScriptInvocation LookupScriptInvocation(string fname);
         string LookupModInvocation(string fname);
-- 
cgit v1.1


From d7cc194e83ade3453649ab897a4f40b0fa856d0d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 26 Mar 2012 00:30:52 +0100
Subject: Correct the design error I introduced into ScriptComms. Untested but
 about to be.

---
 OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 8bfbbf8..8a08fbe 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -31,7 +31,6 @@ using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate void ScriptCommand(UUID script, string id, string module, string command, string k);
-    public delegate object ScriptInvocation(UUID script, object[] parms);
 
     /// <summary>
     /// Interface for communication between OpenSim modules and in-world scripts
@@ -46,10 +45,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         event ScriptCommand OnScriptCommand;
 
-        void RegisterScriptInvocation(ScriptInvocation fn);
-        ScriptInvocation[] GetScriptInvocationList();
+        void RegisterScriptInvocation(Delegate fn);
+        Delegate[] GetScriptInvocationList();
 
-        ScriptInvocation LookupScriptInvocation(string fname);
+        Delegate LookupScriptInvocation(string fname);
         string LookupModInvocation(string fname);
         Type[] LookupTypeSignature(string fname);
         Type LookupReturnType(string fname);
-- 
cgit v1.1


From ac0f1ff0a66e361e7ca24ce4660bf58c5662283c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 26 Mar 2012 01:21:44 +0100
Subject: Dynamically create the delegate type to reduce complexity in the
 caller

---
 OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 8a08fbe..34586f5 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Reflection;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -45,7 +46,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         event ScriptCommand OnScriptCommand;
 
-        void RegisterScriptInvocation(Delegate fn);
+        void RegisterScriptInvocation(object target, MethodInfo mi);
         Delegate[] GetScriptInvocationList();
 
         Delegate LookupScriptInvocation(string fname);
-- 
cgit v1.1


From 98a6c789430bdaba73b5008c1630b37793ee2c5b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 26 Mar 2012 03:32:30 +0100
Subject: Fix the omission on the interface declaration

---
 OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 34586f5..2183c1c 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         event ScriptCommand OnScriptCommand;
 
-        void RegisterScriptInvocation(object target, MethodInfo mi);
+        void RegisterScriptInvocation(object target, string method);
         Delegate[] GetScriptInvocationList();
 
         Delegate LookupScriptInvocation(string fname);
-- 
cgit v1.1


From 7e0936e4b6ec0596390266a8435dea9c3f19f09c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 26 Mar 2012 14:19:55 +0100
Subject: Add a hust UUID to the script invocations

---
 OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 2183c1c..34a4bfc 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Framework.Interfaces
         Type[] LookupTypeSignature(string fname);
         Type LookupReturnType(string fname);
 
-        object InvokeOperation(UUID scriptId, string fname, params object[] parms);
+        object InvokeOperation(UUID hostId, UUID scriptId, string fname, params object[] parms);
 
         /// <summary>
         /// Send a link_message event to an in-world script
-- 
cgit v1.1


From ad865ab4fc6703610d15336fa22fa2a62f628979 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 26 Mar 2012 16:46:07 +0100
Subject: Add some more overloads to allow registering overloaded methods and
 lists of methods.

---
 OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 34a4bfc..bfe1e8d 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -47,6 +47,8 @@ namespace OpenSim.Region.Framework.Interfaces
         event ScriptCommand OnScriptCommand;
 
         void RegisterScriptInvocation(object target, string method);
+        void RegisterScriptInvocation(object target, MethodInfo method);
+        void RegisterScriptInvocation(object target, string[] methods);
         Delegate[] GetScriptInvocationList();
 
         Delegate LookupScriptInvocation(string fname);
-- 
cgit v1.1