diff options
| author | Melanie | 2012-03-26 14:22:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-26 14:22:49 +0100 |
| commit | da9743d1d7a6cefdded6debf87767c73cbc24ca1 (patch) | |
| tree | 379ba8adc49565c59402c372437a27f048f31b53 /OpenSim/Region/Framework | |
| parent | Fix the omission on the interface declaration (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-da9743d1d7a6cefdded6debf87767c73cbc24ca1.zip opensim-SC_OLD-da9743d1d7a6cefdded6debf87767c73cbc24ca1.tar.gz opensim-SC_OLD-da9743d1d7a6cefdded6debf87767c73cbc24ca1.tar.bz2 opensim-SC_OLD-da9743d1d7a6cefdded6debf87767c73cbc24ca1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 54 | Type[] LookupTypeSignature(string fname); | 54 | Type[] LookupTypeSignature(string fname); |
| 55 | Type LookupReturnType(string fname); | 55 | Type LookupReturnType(string fname); |
| 56 | 56 | ||
| 57 | object InvokeOperation(UUID scriptId, string fname, params object[] parms); | 57 | object InvokeOperation(UUID hostId, UUID scriptId, string fname, params object[] parms); |
| 58 | 58 | ||
| 59 | /// <summary> | 59 | /// <summary> |
| 60 | /// Send a link_message event to an in-world script | 60 | /// Send a link_message event to an in-world script |