From bdd2d59d6d97e555ad572d1ec5649697233903ab Mon Sep 17 00:00:00 2001
From: onefang
Date: Sat, 20 Jul 2019 20:24:25 +1000
Subject: Allow menu items longer than 24 characters once more.

I've never seen any problems with allowing this, my NPC tool does that.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs            | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index edd22a8..c18f587 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2518,7 +2518,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             for (int i = 0; i < buttonlabels.Length; i++)
             {
                 buttons[i] = new ScriptDialogPacket.ButtonsBlock();
-                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24);
+                buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
             }
             dialog.Buttons = buttons;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 229ad1d..8141c17 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7549,16 +7549,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (buttons.Data[i].ToString() == String.Empty)
                 {
-                    Error("llDialog", "Button label cannot be blank");
+                    Error("llDialog", "Button label cannot be blank.");
                     return;
                 }
-/*
                 if (buttons.Data[i].ToString().Length > 24)
                 {
-                    Error("llDialog", "Button label cannot be longer than 24 characters");
-                    return;
+                    Error("llDialog", "Button label should not be longer than 24 characters.");
                 }
-*/
                 buts[i] = buttons.Data[i].ToString();
             }
 
-- 
cgit v1.1