aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
diff options
context:
space:
mode:
authorMelanie2012-08-18 12:57:49 +0100
committerMelanie2012-08-18 12:57:49 +0100
commit9d6fe1224aa90896edb624d34f77d7c36b368258 (patch)
treee88deb1ab440dce0db50e8745e4171e56413959c /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
parentDo a proper null check to avoid the overloaded operator == trap (diff)
parentWhen reporting a thread timeout, create a copy of the info rather than passin... (diff)
downloadopensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.zip
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.gz
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.bz2
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index e1c054d..cad8518 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -328,6 +328,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
328 public const int PRIM_OMEGA = 32; 328 public const int PRIM_OMEGA = 32;
329 public const int PRIM_POS_LOCAL = 33; 329 public const int PRIM_POS_LOCAL = 33;
330 public const int PRIM_LINK_TARGET = 34; 330 public const int PRIM_LINK_TARGET = 34;
331 public const int PRIM_SLICE = 35;
331 public const int PRIM_TEXGEN_DEFAULT = 0; 332 public const int PRIM_TEXGEN_DEFAULT = 0;
332 public const int PRIM_TEXGEN_PLANAR = 1; 333 public const int PRIM_TEXGEN_PLANAR = 1;
333 334