diff options
| author | Diva Canto | 2009-12-29 17:21:37 -0800 |
|---|---|---|
| committer | Diva Canto | 2009-12-29 17:21:37 -0800 |
| commit | 170a04ce4122513b8c996fbc19155a5d45095a31 (patch) | |
| tree | b5ec9139324a7c69185a8c9e5d5931f461e2c95f /OpenSim | |
| parent | More renames to make everything consistent. This is the UserAccountService. (diff) | |
| parent | Fix an omission in LSL that causes a viewer crash (diff) | |
| download | opensim-SC-170a04ce4122513b8c996fbc19155a5d45095a31.zip opensim-SC-170a04ce4122513b8c996fbc19155a5d45095a31.tar.gz opensim-SC-170a04ce4122513b8c996fbc19155a5d45095a31.tar.bz2 opensim-SC-170a04ce4122513b8c996fbc19155a5d45095a31.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 2b6d9bd..6102504 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6260,6 +6260,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6260 | LSLError("First parameter to llDialog needs to be a key"); | 6260 | LSLError("First parameter to llDialog needs to be a key"); |
| 6261 | return; | 6261 | return; |
| 6262 | } | 6262 | } |
| 6263 | if (buttons.Length < 1) | ||
| 6264 | { | ||
| 6265 | LSLError("No less than 1 button can be shown"); | ||
| 6266 | return; | ||
| 6267 | } | ||
| 6263 | if (buttons.Length > 12) | 6268 | if (buttons.Length > 12) |
| 6264 | { | 6269 | { |
| 6265 | LSLError("No more than 12 buttons can be shown"); | 6270 | LSLError("No more than 12 buttons can be shown"); |