diff options
author | Melanie | 2012-08-01 00:08:02 +0100 |
---|---|---|
committer | Melanie | 2012-08-01 00:08:02 +0100 |
commit | 8114260946be8bbe6754d497f104804d203e00e2 (patch) | |
tree | b87ac81a06f7fffbb39d88e6bc24d4c615b05cee /OpenSim/Region/Framework | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Resolve a deadlock between INPCModule and SensorRepeat by replacing the Senso... (diff) | |
download | opensim-SC-8114260946be8bbe6754d497f104804d203e00e2.zip opensim-SC-8114260946be8bbe6754d497f104804d203e00e2.tar.gz opensim-SC-8114260946be8bbe6754d497f104804d203e00e2.tar.bz2 opensim-SC-8114260946be8bbe6754d497f104804d203e00e2.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs index bfe1e8d..ed71a95 100644 --- a/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs +++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs | |||
@@ -67,6 +67,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
67 | /// <param name="key"></param> | 67 | /// <param name="key"></param> |
68 | void DispatchReply(UUID scriptId, int code, string text, string key); | 68 | void DispatchReply(UUID scriptId, int code, string text, string key); |
69 | 69 | ||
70 | /// For constants | ||
71 | void RegisterConstant(string cname, object value); | ||
72 | object LookupModConstant(string cname); | ||
73 | |||
70 | // For use ONLY by the script API | 74 | // For use ONLY by the script API |
71 | void RaiseEvent(UUID script, string id, string module, string command, string key); | 75 | void RaiseEvent(UUID script, string id, string module, string command, string key); |
72 | } | 76 | } |