diff options
| author | Melanie | 2010-11-27 01:08:12 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-27 01:08:12 +0000 |
| commit | e05f728b084d66de964b8d7fa0a9318b94526c4e (patch) | |
| tree | 43feb59eae181a09e3a35c4f6a961e3cd8ad2352 /OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs | |
| parent | Convert the scope id in the im session id to a URL variable. Fixes offline (diff) | |
| parent | llVecNorm nant test (diff) | |
| download | opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.zip opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.tar.gz opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.tar.bz2 opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 |