diff options
| author | Diva Canto | 2014-12-25 08:01:50 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-12-25 08:01:50 -0800 |
| commit | 27c34b69bf5960e02b087f9f298dcbe19f03b142 (patch) | |
| tree | f299009958858da9db464dcbc84bd03beae0ca15 /OpenSim/Region/ScriptEngine/Interfaces | |
| parent | Revert "Update libomv to grab latest bug fixes for Collada upload." (diff) | |
| parent | If a moap entry has EnableWhiteList but WhiteList == null, then properly bloc... (diff) | |
| download | opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.zip opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.gz opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.bz2 opensim-SC-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index b9a217b..1097efb 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
| @@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
| 222 | void SetVars(Dictionary<string, object> vars); | 222 | void SetVars(Dictionary<string, object> vars); |
| 223 | DetectParams GetDetectParams(int idx); | 223 | DetectParams GetDetectParams(int idx); |
| 224 | UUID GetDetectID(int idx); | 224 | UUID GetDetectID(int idx); |
| 225 | void SaveState(string assembly); | 225 | void SaveState(); |
| 226 | void DestroyScriptInstance(); | 226 | void DestroyScriptInstance(); |
| 227 | 227 | ||
| 228 | IScriptApi GetApi(string name); | 228 | IScriptApi GetApi(string name); |