aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-11-11 06:06:22 +0000
committerUbitUmarov2015-11-11 06:06:22 +0000
commit649a3fc39c16db79a529567d1ab54a2dc2d49fc8 (patch)
tree069609d3235f4b22320dd84282e3adfe30b2c871
parentlimit llDialog buttons text to 24 bytes (at lludp level) (diff)
downloadopensim-SC-649a3fc39c16db79a529567d1ab54a2dc2d49fc8.zip
opensim-SC-649a3fc39c16db79a529567d1ab54a2dc2d49fc8.tar.gz
opensim-SC-649a3fc39c16db79a529567d1ab54a2dc2d49fc8.tar.bz2
opensim-SC-649a3fc39c16db79a529567d1ab54a2dc2d49fc8.tar.xz
dont abort llDialog if buttons labels are longer than 24bytes, let udp truncate. This is not as spec but allows old scripts or with minor bugs to still work
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 2 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 8154c4f..f9f21f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7925,11 +7925,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7925 Error("llDialog", "Button label cannot be blank"); 7925 Error("llDialog", "Button label cannot be blank");
7926 return; 7926 return;
7927 } 7927 }
7928/*
7928 if (buttons.Data[i].ToString().Length > 24) 7929 if (buttons.Data[i].ToString().Length > 24)
7929 { 7930 {
7930 Error("llDialog", "Button label cannot be longer than 24 characters"); 7931 Error("llDialog", "Button label cannot be longer than 24 characters");
7931 return; 7932 return;
7932 } 7933 }
7934*/
7933 buts[i] = buttons.Data[i].ToString(); 7935 buts[i] = buttons.Data[i].ToString();
7934 } 7936 }
7935 7937