aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
diff options
context:
space:
mode:
authorDiva Canto2010-11-29 09:58:20 -0800
committerDiva Canto2010-11-29 09:58:20 -0800
commitf3835fe15c91ece4ad61ba1caa67603374ad2574 (patch)
treebed4cf2014aeea194086d940e8c86ac998bc692a /OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
parentFix unit test. (diff)
parentFix the build break (diff)
downloadopensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.zip
opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.tar.gz
opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.tar.bz2
opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs3
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