ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

thread.abort is gone. Coment out so things compile

Browse Source
This commit is contained in:
UbitUmarov
2022-10-02 11:30:41 +01:00
parent fc3543c24a
commit f6a47a9f47
9 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
View File

@@ -60,6 +60,8 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
using SceneScriptEvents = OpenSim.Region.Framework.Scenes.scriptEvents;
[assembly: Addin("YEngine", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
@@ -229,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
catch { }
try
{
oscode = ((OpenSim.Region.Framework.Scenes.scriptEvents)(1ul << i)).ToString();
oscode = ((SceneScriptEvents)(1ul << i)).ToString();
Convert.ToInt64(oscode);
oscode = "undefined";
}
@@ -712,8 +714,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
lock(m_SleepQueue)
Monitor.PulseAll(m_SleepQueue);
if(!m_SleepThread.Join(250))
m_SleepThread.Abort();
//if(!m_SleepThread.Join(250))
// m_SleepThread.Abort();
m_SleepThread = null;
}