aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-09-09 14:51:41 +0000
committerSean Dague2008-09-09 14:51:41 +0000
commitf141751cf9bba02a6fdd78d4c1578d6b73f31897 (patch)
treed38ba4b1b8a73c4ccc34736039f1479f56359d70
parentFrom: alan_webb@us.ibm.com (diff)
downloadopensim-SC_OLD-f141751cf9bba02a6fdd78d4c1578d6b73f31897.zip
opensim-SC_OLD-f141751cf9bba02a6fdd78d4c1578d6b73f31897.tar.gz
opensim-SC_OLD-f141751cf9bba02a6fdd78d4c1578d6b73f31897.tar.bz2
opensim-SC_OLD-f141751cf9bba02a6fdd78d4c1578d6b73f31897.tar.xz
From: alan_webb@us.ibm.com
Make CHANGED constants consistent with LSL, and consistent across the code base
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs2
4 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index e1ab733..be22484 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -2017,6 +2017,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
2017 public const int CHANGED_LINK = 32; 2017 public const int CHANGED_LINK = 32;
2018 public const int CHANGED_ALLOWED_DROP = 64; 2018 public const int CHANGED_ALLOWED_DROP = 64;
2019 public const int CHANGED_OWNER = 128; 2019 public const int CHANGED_OWNER = 128;
2020 public const int CHANGED_REGION_RESTART = 256;
2021 public const int CHANGED_REGION = 512;
2022 public const int CHANGED_TELEPORT = 1024;
2020 public const int TYPE_INVALID = 0; 2023 public const int TYPE_INVALID = 0;
2021 public const int TYPE_INTEGER = 1; 2024 public const int TYPE_INTEGER = 1;
2022 public const int TYPE_double = 2; 2025 public const int TYPE_double = 2;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 352de27..eaabdd5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -54,7 +54,10 @@ namespace OpenSim.Region.Environment.Scenes
54 TEXTURE = 16, 54 TEXTURE = 16,
55 LINK = 32, 55 LINK = 32,
56 ALLOWED_DROP = 64, 56 ALLOWED_DROP = 64,
57 OWNER = 128 57 OWNER = 128,
58 REGION_RESTART = 256,
59 REGION = 512,
60 TELEPORT = 1024
58 } 61 }
59 62
60 // I don't really know where to put this except here. 63 // I don't really know where to put this except here.
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index d59da96..4fba1fd 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -2263,6 +2263,9 @@ namespace OpenSim.Region.ScriptEngine.Common
2263 public const int CHANGED_LINK = 32; 2263 public const int CHANGED_LINK = 32;
2264 public const int CHANGED_ALLOWED_DROP = 64; 2264 public const int CHANGED_ALLOWED_DROP = 64;
2265 public const int CHANGED_OWNER = 128; 2265 public const int CHANGED_OWNER = 128;
2266 public const int CHANGED_REGION_RESTART = 256;
2267 public const int CHANGED_REGION = 512;
2268 public const int CHANGED_TELEPORT = 1024;
2266 public const int TYPE_INVALID = 0; 2269 public const int TYPE_INVALID = 0;
2267 public const int TYPE_INTEGER = 1; 2270 public const int TYPE_INTEGER = 1;
2268 public const int TYPE_double = 2; 2271 public const int TYPE_double = 2;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 6de7ca4..5bcb135 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -258,6 +258,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
258 public const int CHANGED_ALLOWED_DROP = 64; 258 public const int CHANGED_ALLOWED_DROP = 64;
259 public const int CHANGED_OWNER = 128; 259 public const int CHANGED_OWNER = 128;
260 public const int CHANGED_REGION_RESTART = 256; 260 public const int CHANGED_REGION_RESTART = 256;
261 public const int CHANGED_REGION = 512;
262 public const int CHANGED_TELEPORT = 1024;
261 public const int TYPE_INVALID = 0; 263 public const int TYPE_INVALID = 0;
262 public const int TYPE_INTEGER = 1; 264 public const int TYPE_INTEGER = 1;
263 public const int TYPE_FLOAT = 2; 265 public const int TYPE_FLOAT = 2;