aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-12-31 06:21:03 +0100
committerMelanie2009-12-31 06:21:03 +0100
commitb3cb99036ccfeeab5a4672caf709f19a81ea75bb (patch)
tree17c4a442611553391140c820476806f3a9e681de /OpenSim
parentAdd a small delay in NewAgentConnection to fix an issue with Hippo (diff)
parentRevert "Merge branch 'master' into careminster" (diff)
downloadopensim-SC-b3cb99036ccfeeab5a4672caf709f19a81ea75bb.zip
opensim-SC-b3cb99036ccfeeab5a4672caf709f19a81ea75bb.tar.gz
opensim-SC-b3cb99036ccfeeab5a4672caf709f19a81ea75bb.tar.bz2
opensim-SC-b3cb99036ccfeeab5a4672caf709f19a81ea75bb.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim')
-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");