aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-07-20 20:24:25 +1000
committeronefang2019-07-20 20:24:25 +1000
commitbdd2d59d6d97e555ad572d1ec5649697233903ab (patch)
treefc3510a76ec83e3af44daa558f8da3b154bb372e
parentSwitch to using the internal offline message URL by default. (diff)
downloadopensim-SC_OLD-bdd2d59d6d97e555ad572d1ec5649697233903ab.zip
opensim-SC_OLD-bdd2d59d6d97e555ad572d1ec5649697233903ab.tar.gz
opensim-SC_OLD-bdd2d59d6d97e555ad572d1ec5649697233903ab.tar.bz2
opensim-SC_OLD-bdd2d59d6d97e555ad572d1ec5649697233903ab.tar.xz
Allow menu items longer than 24 characters once more.
I've never seen any problems with allowing this, my NPC tool does that.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
2 files changed, 3 insertions, 6 deletions
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
2518 for (int i = 0; i < buttonlabels.Length; i++) 2518 for (int i = 0; i < buttonlabels.Length; i++)
2519 { 2519 {
2520 buttons[i] = new ScriptDialogPacket.ButtonsBlock(); 2520 buttons[i] = new ScriptDialogPacket.ButtonsBlock();
2521 buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24); 2521 buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
2522 } 2522 }
2523 dialog.Buttons = buttons; 2523 dialog.Buttons = buttons;
2524 2524
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
7549 { 7549 {
7550 if (buttons.Data[i].ToString() == String.Empty) 7550 if (buttons.Data[i].ToString() == String.Empty)
7551 { 7551 {
7552 Error("llDialog", "Button label cannot be blank"); 7552 Error("llDialog", "Button label cannot be blank.");
7553 return; 7553 return;
7554 } 7554 }
7555/*
7556 if (buttons.Data[i].ToString().Length > 24) 7555 if (buttons.Data[i].ToString().Length > 24)
7557 { 7556 {
7558 Error("llDialog", "Button label cannot be longer than 24 characters"); 7557 Error("llDialog", "Button label should not be longer than 24 characters.");
7559 return;
7560 } 7558 }
7561*/
7562 buts[i] = buttons.Data[i].ToString(); 7559 buts[i] = buttons.Data[i].ToString();
7563 } 7560 }
7564 7561