diff options
author | Melanie | 2010-08-06 15:11:18 +0100 |
---|---|---|
committer | Melanie | 2010-08-06 15:11:18 +0100 |
commit | 120f3a18f298ac023e80da187f70e886a7cacfbd (patch) | |
tree | 5d82092f0b822e5c72d1663cdcf0c9377ace6e3b /OpenSim/Region | |
parent | People can't leave their hands ooff "well enough". StateSource 0 was region (diff) | |
download | opensim-SC-120f3a18f298ac023e80da187f70e886a7cacfbd.zip opensim-SC-120f3a18f298ac023e80da187f70e886a7cacfbd.tar.gz opensim-SC-120f3a18f298ac023e80da187f70e886a7cacfbd.tar.bz2 opensim-SC-120f3a18f298ac023e80da187f70e886a7cacfbd.tar.xz |
Correct some script constants.
Diffstat (limited to 'OpenSim/Region')
5 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index de4c5fb..a90e0f3 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
131 | anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) | 131 | anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) |
132 | { | 132 | { |
133 | // 16384 is CHANGED_ANIMATION | 133 | // 16384 is CHANGED_ANIMATION |
134 | m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 }); | 134 | m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION}); |
135 | SendAnimPack(); | 135 | SendAnimPack(); |
136 | } | 136 | } |
137 | } | 137 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 7036884..69f9627 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -56,9 +56,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
56 | LINK = 32, | 56 | LINK = 32, |
57 | ALLOWED_DROP = 64, | 57 | ALLOWED_DROP = 64, |
58 | OWNER = 128, | 58 | OWNER = 128, |
59 | REGION_RESTART = 256, | 59 | REGION = 256, |
60 | REGION = 512, | 60 | TELEPORT = 512, |
61 | TELEPORT = 1024 | 61 | REGION_RESTART = 1024, |
62 | ANIMATION = 16384 | ||
62 | } | 63 | } |
63 | 64 | ||
64 | // I don't really know where to put this except here. | 65 | // I don't really know where to put this except here. |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e073a9b..4c17615 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3460,7 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3460 | if (m == null) // No script engine loaded | 3460 | if (m == null) // No script engine loaded |
3461 | continue; | 3461 | continue; |
3462 | 3462 | ||
3463 | m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { 16384 }); | 3463 | m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION }); |
3464 | } | 3464 | } |
3465 | } | 3465 | } |
3466 | } | 3466 | } |
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 |