ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

make a xengine test happier

Browse Source
This commit is contained in:
UbitUmarov
2022-08-20 19:17:33 +01:00
parent 3a201f7e3d
commit 20c12e195b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Constants.cs
View File

@@ -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);

4
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@@ -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

2
OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
View File

@@ -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);