diff options
| author | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
| commit | 2205d1c486666399085f2e6d3b7d5d08474587cf (patch) | |
| tree | 10fa1e3ed522d4eefdd3770a531648ee2c9957f4 /OpenSim/Region/ScriptEngine/Shared | |
| parent | * Attempts to resolve the megaregion terrain edit rebound. (diff) | |
| parent | Fix an omission in LSL that causes a viewer crash (diff) | |
| download | opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -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"); |