aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Interfaces
diff options
context:
space:
mode:
authorMelanie2010-11-27 13:07:23 +0100
committerMelanie2010-11-27 13:07:23 +0100
commit2412b3cb4a7e8e33cc9e1475aa66ce14cab032b7 (patch)
treea37a3574ce60fec440c4ed8576725d3a06e22057 /OpenSim/Region/ScriptEngine/Interfaces
parentInstrument TI Dictionary to finally find that pesky script-caused deadlock (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-2412b3cb4a7e8e33cc9e1475aa66ce14cab032b7.zip
opensim-SC_OLD-2412b3cb4a7e8e33cc9e1475aa66ce14cab032b7.tar.gz
opensim-SC_OLD-2412b3cb4a7e8e33cc9e1475aa66ce14cab032b7.tar.bz2
opensim-SC_OLD-2412b3cb4a7e8e33cc9e1475aa66ce14cab032b7.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Interfaces')
-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