diff options
| author | Melanie | 2012-06-29 22:11:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-29 22:11:49 +0100 |
| commit | 05cf51cbbdb3f33bb4c532eefc24eb0a194ed378 (patch) | |
| tree | 5514845e589587a84a621bb6e576136d4869ad29 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Revert "Mantis 5977 Corrections to llRegionSayTo" (diff) | |
| parent | Fix llRegionSayTo the right way (diff) | |
| download | opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.zip opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.gz opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.bz2 opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 5c6ad8a..a08cc42 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -671,7 +671,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 671 | 671 | ||
| 672 | public static readonly LSLInteger RCERR_UNKNOWN = -1; | 672 | public static readonly LSLInteger RCERR_UNKNOWN = -1; |
| 673 | public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; | 673 | public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; |
| 674 | public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; | 674 | public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3; |
| 675 | 675 | ||
| 676 | public const int KFM_MODE = 1; | 676 | public const int KFM_MODE = 1; |
| 677 | public const int KFM_LOOP = 1; | 677 | public const int KFM_LOOP = 1; |