From 20c12e195b3ac12d9009575c0d70fb0a12d18aaa Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 20 Aug 2022 19:17:33 +0100 Subject: [PATCH] make a xengine test happier --- OpenSim/Framework/Constants.cs | 3 ++- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 4 ++-- .../Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 862511ea4e..f97b69acc0 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs @@ -61,7 +61,8 @@ namespace OpenSim.Framework public static readonly string DefaultScript = "2074003b-8d5f-40e5-8b20-581c1c50aedb"; // must be on default assets and cache public static readonly UUID DefaultScriptID = new UUID(DefaultScript); - public static readonly byte[] DefaultScriptData = osUTF8.GetASCIIBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"); + public static readonly string DefaultScriptText = "default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"; + public static readonly byte[] DefaultScriptData = osUTF8.GetASCIIBytes(DefaultScriptText); public static readonly string EmptyNotecard = "4b6a777d-7bcd-4fc4-b06f-929b21e32925"; public static readonly UUID EmptyNotecardID = new UUID(EmptyNotecard); diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 47d0addea2..d70f46342e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1864,11 +1864,11 @@ namespace OpenSim.Region.ScriptEngine.Shared public static bool operator ==(key k1, key k2) { - return k1.value == k2.value; + return k1.value.Equals(k2.value); } public static bool operator !=(key k1, key k2) { - return k1.value != k2.value; + return !k1.value.Equals(k2.value); } #endregion diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs index 71ef0ac9ab..871dfcbf71 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests m_scene.EventManager.OnChatFromWorld += OnChatFromWorld; - SceneObjectPart partWhereRezzed = m_scene.RezNewScript(userId, itemTemplate); + SceneObjectPart partWhereRezzed = m_scene.RezNewScript(userId, itemTemplate, Constants.DefaultScriptText); m_chatEvent.WaitOne(60000);