aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2010-11-18 01:11:11 +0100
committerMelanie2010-11-18 01:11:11 +0100
commit095e3aae670a706406414b6ee069872463ec83e7 (patch)
treea92b2a695621b301009dddede9520bb26e2e319a /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-095e3aae670a706406414b6ee069872463ec83e7.zip
opensim-SC_OLD-095e3aae670a706406414b6ee069872463ec83e7.tar.gz
opensim-SC_OLD-095e3aae670a706406414b6ee069872463ec83e7.tar.bz2
opensim-SC_OLD-095e3aae670a706406414b6ee069872463ec83e7.tar.xz
Allow llDialog without any buttons and add the automatic OK button as it is
in SL.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 254ed0f..6d8e558 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6736,8 +6736,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6736 } 6736 }
6737 if (buttons.Length < 1) 6737 if (buttons.Length < 1)
6738 { 6738 {
6739 LSLError("No less than 1 button can be shown"); 6739 buttons.Add("OK");
6740 return;
6741 } 6740 }
6742 if (buttons.Length > 12) 6741 if (buttons.Length > 12)
6743 { 6742 {