ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +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/XMREngXmrTestLs.cs
View File

@@ -41,6 +41,9 @@ 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 SharedEventParams = OpenSim.Region.ScriptEngine.Shared.EventParams;
using SharedScriptBaseClass = OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass;
namespace OpenSim.Region.ScriptEngine.Yengine
{
public partial class Yengine
@@ -253,8 +256,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
return;
i++;
}
OpenSim.Region.ScriptEngine.Shared.EventParams eps =
new OpenSim.Region.ScriptEngine.Shared.EventParams(eventname, paramvalues, zeroDetectParams);
SharedEventParams eps = new SharedEventParams(eventname, paramvalues, zeroDetectParams);
// Scan instance list to find those that match selection criteria.
if(!Monitor.TryEnter(m_InstancesDict, 100))
@@ -367,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
if(token is TokenName)
{
FieldInfo field = typeof(OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass).GetField(((TokenName)token).val);
FieldInfo field = typeof(SharedScriptBaseClass).GetField(((TokenName)token).val);
if((field != null) && field.IsPublic && (field.IsLiteral || (field.IsStatic && field.IsInitOnly)))
{
return field.GetValue(null);

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;
}

1
OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
View File

@@ -30,7 +30,6 @@ using System.Threading;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.Remoting.Lifetime;
using System.Security.Policy;
using System.IO;
using System.Xml;