aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-01-10 21:49:38 +0000
committerUbitUmarov2019-01-10 21:49:38 +0000
commit43f4eca67cb08fea911cb456b9301d6b74a5892c (patch)
tree52272a8bddcb8874938b7542172510692edcfded /OpenSim
parentminor direct use of libomv changes (diff)
downloadopensim-SC-43f4eca67cb08fea911cb456b9301d6b74a5892c.zip
opensim-SC-43f4eca67cb08fea911cb456b9301d6b74a5892c.tar.gz
opensim-SC-43f4eca67cb08fea911cb456b9301d6b74a5892c.tar.bz2
opensim-SC-43f4eca67cb08fea911cb456b9301d6b74a5892c.tar.xz
mantis 8447: empty buttons list in llDialog now shows Ok button
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c757cd0..22443a9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8135,10 +8135,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8135 int length = buttons.Length; 8135 int length = buttons.Length;
8136 if (length < 1) 8136 if (length < 1)
8137 { 8137 {
8138 Error("llDialog", "At least 1 button must be shown"); 8138 buttons.Add(new LSL_String("Ok"));
8139 return; 8139 length = 1;
8140 } 8140 }
8141 if (length > 12) 8141 else if (length > 12)
8142 { 8142 {
8143 Error("llDialog", "No more than 12 buttons can be shown"); 8143 Error("llDialog", "No more than 12 buttons can be shown");
8144 return; 8144 return;