aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2010-08-06 15:11:18 +0100
committerMelanie2010-08-06 15:11:18 +0100
commit120f3a18f298ac023e80da187f70e886a7cacfbd (patch)
tree5d82092f0b822e5c72d1663cdcf0c9377ace6e3b /OpenSim/Region/ScriptEngine
parentPeople can't leave their hands ooff "well enough". StateSource 0 was region (diff)
downloadopensim-SC_OLD-120f3a18f298ac023e80da187f70e886a7cacfbd.zip
opensim-SC_OLD-120f3a18f298ac023e80da187f70e886a7cacfbd.tar.gz
opensim-SC_OLD-120f3a18f298ac023e80da187f70e886a7cacfbd.tar.bz2
opensim-SC_OLD-120f3a18f298ac023e80da187f70e886a7cacfbd.tar.xz
Correct some script constants.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs4
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index dba6502..69f48c9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -273,9 +273,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
273 public const int CHANGED_LINK = 32; 273 public const int CHANGED_LINK = 32;
274 public const int CHANGED_ALLOWED_DROP = 64; 274 public const int CHANGED_ALLOWED_DROP = 64;
275 public const int CHANGED_OWNER = 128; 275 public const int CHANGED_OWNER = 128;
276 public const int CHANGED_REGION_RESTART = 256; 276 public const int CHANGED_REGION = 256;
277 public const int CHANGED_REGION = 512; 277 public const int CHANGED_TELEPORT = 512;
278 public const int CHANGED_TELEPORT = 1024; 278 public const int CHANGED_REGION_RESTART = 1024;
279 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
279 public const int CHANGED_ANIMATION = 16384; 280 public const int CHANGED_ANIMATION = 16384;
280 public const int TYPE_INVALID = 0; 281 public const int TYPE_INVALID = 0;
281 public const int TYPE_INTEGER = 1; 282 public const int TYPE_INTEGER = 1;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 3dd381d..ccfe6a7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -392,13 +392,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
392 { 392 {
393// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script"); 393// m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
394 PostEvent(new EventParams("changed", 394 PostEvent(new EventParams("changed",
395 new Object[] {new LSL_Types.LSLInteger(256)}, new DetectParams[0])); 395 new Object[] { (int)Changed.REGION_RESTART }, new DetectParams[0]));
396 } 396 }
397 else if (m_stateSource == StateSource.PrimCrossing) 397 else if (m_stateSource == StateSource.PrimCrossing)
398 { 398 {
399 // CHANGED_REGION 399 // CHANGED_REGION
400 PostEvent(new EventParams("changed", 400 PostEvent(new EventParams("changed",
401 new Object[] {new LSL_Types.LSLInteger(512)}, new DetectParams[0])); 401 new Object[] { (int)Changed.REGION }, new DetectParams[0]));
402 } 402 }
403 } 403 }
404 else 404 else