diff options
| author | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
| commit | 45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a (patch) | |
| tree | 0351fb2c756a46d522fe41798c3969e020a3258d /OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |
| parent | Merge branch 'master-core' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.zip opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.gz opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.bz2 opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs index 0c99d8c..8b7871b 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |||
| @@ -42,7 +42,8 @@ namespace OpenSim.Region.ScriptEngine.Interfaces | |||
| 42 | NewRez = 1, | 42 | NewRez = 1, |
| 43 | PrimCrossing = 2, | 43 | PrimCrossing = 2, |
| 44 | ScriptedRez = 3, | 44 | ScriptedRez = 3, |
| 45 | AttachedRez = 4 | 45 | AttachedRez = 4, |
| 46 | Teleporting = 5 | ||
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | public interface IScriptWorkItem | 49 | public interface IScriptWorkItem |