aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-12-30 00:36:16 +0000
committerMelanie2009-12-30 00:37:28 +0000
commit8f0d6d6b5c2a66681cc80f33d10b0635a1257b25 (patch)
tree9639026f9ee63810209b891912dac81ee36fd69d /OpenSim/Region
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
downloadopensim-SC_OLD-8f0d6d6b5c2a66681cc80f33d10b0635a1257b25.zip
opensim-SC_OLD-8f0d6d6b5c2a66681cc80f33d10b0635a1257b25.tar.gz
opensim-SC_OLD-8f0d6d6b5c2a66681cc80f33d10b0635a1257b25.tar.bz2
opensim-SC_OLD-8f0d6d6b5c2a66681cc80f33d10b0635a1257b25.tar.xz
Fix an omission in LSL that causes a viewer crash
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
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 c9d6742..3a229c2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6363,6 +6363,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6363 LSLError("First parameter to llDialog needs to be a key"); 6363 LSLError("First parameter to llDialog needs to be a key");
6364 return; 6364 return;
6365 } 6365 }
6366 if (buttons.Length < 1)
6367 {
6368 LSLError("No less than 1 button can be shown");
6369 return;
6370 }
6366 if (buttons.Length > 12) 6371 if (buttons.Length > 12)
6367 { 6372 {
6368 LSLError("No more than 12 buttons can be shown"); 6373 LSLError("No more than 12 buttons can be shown");