From c6b27cc02ae41f564d63479f8c660197174a8e60 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 11 Oct 2020 04:00:35 +0100 Subject: [PATCH] silly bug on llSetText exec --- .../Region/Framework/Scenes/SceneObjectPart.cs | 16 ++++++++-------- .../Shared/Api/Implementation/LSL_Api.cs | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c9d8874f46..3d557fc540 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -4106,15 +4106,15 @@ namespace OpenSim.Region.Framework.Scenes { Color oldcolor = Color; - Color = Color.FromArgb((int) (alpha*0xff), - (int) (color.X*0xff), - (int) (color.Y*0xff), - (int) (color.Z*0xff)); + Color = Color.FromArgb((int) (alpha * 0xff), + (int) (color.X * 0xff), + (int) (color.Y * 0xff), + (int) (color.Z * 0xff)); osUTF8 old = osUTF8Text; if(string.IsNullOrEmpty(text)) { - osUTF8Text = new osUTF8(text, 254); - if (ParentGroup != null && (oldcolor != Color || !osUTF8Text.Equals(old))) + osUTF8Text = null; + if (ParentGroup != null && (oldcolor != Color || old != null)) { ParentGroup.HasGroupChanged = true; ScheduleFullUpdate(); @@ -4122,8 +4122,8 @@ namespace OpenSim.Region.Framework.Scenes } else { - osUTF8Text = null; - if (ParentGroup != null && (oldcolor != Color || old != null)) + osUTF8Text = new osUTF8(text, 254); + if (ParentGroup != null && (oldcolor != Color || !osUTF8Text.Equals(old))) { ParentGroup.HasGroupChanged = true; ScheduleFullUpdate(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 85acbd5c0b..7f1b07358c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4933,9 +4933,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { m_host.AddScriptLPS(1); Vector3 av3 = Util.Clip(color, 0.0f, 1.0f); - byte[] data; - data = Util.StringToBytesNoTerm(text,256); - text = Util.UTF8.GetString(data); m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); }