aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorBlueWall2012-10-20 05:25:58 -0400
committerBlueWall2012-10-20 05:25:58 -0400
commit07f1d44174f5e2b4e3d5ffdec3619bb84f357af2 (patch)
tree83cc0442b2c1b89a5b3dd94cff23d5098415777e /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge branch 'master' into connector_plugin (diff)
parentFix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl... (diff)
downloadopensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.zip
opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.gz
opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.bz2
opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.xz
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-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 60a7e14..62bd6b8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -612,6 +612,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
612 public const int CLICK_ACTION_OPEN = 4; 612 public const int CLICK_ACTION_OPEN = 4;
613 public const int CLICK_ACTION_PLAY = 5; 613 public const int CLICK_ACTION_PLAY = 5;
614 public const int CLICK_ACTION_OPEN_MEDIA = 6; 614 public const int CLICK_ACTION_OPEN_MEDIA = 6;
615 public const int CLICK_ACTION_ZOOM = 7;
615 616
616 // constants for the llDetectedTouch* functions 617 // constants for the llDetectedTouch* functions
617 public const int TOUCH_INVALID_FACE = -1; 618 public const int TOUCH_INVALID_FACE = -1;