diff options
author | Melanie | 2009-11-26 17:27:03 +0000 |
---|---|---|
committer | Melanie | 2009-11-26 17:27:03 +0000 |
commit | 06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6 (patch) | |
tree | 7c0a0a90235a988d69482a4c93dad6c8bbf6a5fc /OpenSim/Region/ScriptEngine/Interfaces | |
parent | Remove the old remoting-type interregion code for prim/script crossing (diff) | |
parent | Fix a small bug. Trusted script crossings now work again (diff) | |
download | opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.zip opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.gz opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.bz2 opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index f49aea8..ae148a9 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
@@ -96,7 +96,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
96 | UUID GetDetectID(int idx); | 96 | UUID GetDetectID(int idx); |
97 | void SaveState(string assembly); | 97 | void SaveState(string assembly); |
98 | void DestroyScriptInstance(); | 98 | void DestroyScriptInstance(); |
99 | bool CanBeDeleted(); | ||
100 | 99 | ||
101 | IScriptApi GetApi(string name); | 100 | IScriptApi GetApi(string name); |
102 | 101 | ||