Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
This commit is contained in:
Melanie
2012-03-26 14:22:49 +01:00
5 changed files with 35 additions and 9 deletions

View File

@@ -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