diff options
| author | Melanie | 2012-10-23 17:23:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-23 17:23:36 +0100 |
| commit | 13cef0b16adabee46689dab69beec9a8ec813221 (patch) | |
| tree | 62ca6d661b1b2345e5b92889b136e77f776508db /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Refactor: Move Dwell reply to a module that can be disabled. The prior, (diff) | |
| download | opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.zip opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.tar.gz opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.tar.bz2 opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/LandData.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 |
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 c788407..bf66eb6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -613,6 +613,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 613 | public const int CLICK_ACTION_OPEN = 4; | 613 | public const int CLICK_ACTION_OPEN = 4; |
| 614 | public const int CLICK_ACTION_PLAY = 5; | 614 | public const int CLICK_ACTION_PLAY = 5; |
| 615 | public const int CLICK_ACTION_OPEN_MEDIA = 6; | 615 | public const int CLICK_ACTION_OPEN_MEDIA = 6; |
| 616 | public const int CLICK_ACTION_ZOOM = 7; | ||
| 616 | 617 | ||
| 617 | // constants for the llDetectedTouch* functions | 618 | // constants for the llDetectedTouch* functions |
| 618 | public const int TOUCH_INVALID_FACE = -1; | 619 | public const int TOUCH_INVALID_FACE = -1; |