diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OpenSim.Region.ScriptEngine.Shared.Api.csproj b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OpenSim.Region.ScriptEngine.Shared.Api.csproj deleted file mode 100644 index 7e54a700ac9..00000000000 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OpenSim.Region.ScriptEngine.Shared.Api.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - net6.0 - OpenSim.Region.ScriptEngine.Shared.Api - http://opensimulator.org - OpenSim - OpenSimulator developers - - - - - - - - - - ..\..\..\..\..\..\bin\OpenMetaverse.dll - False - - - ..\..\..\..\..\..\bin\OpenMetaverse.StructuredData.dll - False - - - ..\..\..\..\..\..\bin\OpenMetaverseTypes.dll - False - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj deleted file mode 100644 index bf6c3a5cd24..00000000000 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - net6.0 - OpenSim.Region.ScriptEngine.Shared.Api.Runtime - http://opensimulator.org - OpenSim - OpenSimulator developers - - - - ..\..\..\..\..\..\bin\OpenMetaverseTypes.dll - False - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/OpenSim.Region.ScriptEngine.Shared.CodeTools.csproj b/OpenSim/Region/ScriptEngine/Shared/CodeTools/OpenSim.Region.ScriptEngine.Shared.CodeTools.csproj deleted file mode 100644 index 6af6f16c6c1..00000000000 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/OpenSim.Region.ScriptEngine.Shared.CodeTools.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - net6.0 - OpenSim.Region.ScriptEngine.Shared.CodeTools - http://opensimulator.org - OpenSim - OpenSimulator developers - - - - ..\..\..\..\..\bin\OpenMetaverseTypes.dll - False - - - ..\..\..\..\..\bin\Tools.dll - False - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/OpenSim.Region.ScriptEngine.Shared.Instance.csproj b/OpenSim/Region/ScriptEngine/Shared/Instance/OpenSim.Region.ScriptEngine.Shared.Instance.csproj deleted file mode 100644 index 34f6cfa1ccf..00000000000 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/OpenSim.Region.ScriptEngine.Shared.Instance.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - net6.0 - OpenSim.Region.ScriptEngine.Shared.Instance - http://opensimulator.org - OpenSim - OpenSimulator developers - - - - ..\..\..\..\..\bin\OpenMetaverseTypes.dll - False - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/Shared/OpenSim.Region.ScriptEngine.Shared.csproj b/OpenSim/Region/ScriptEngine/Shared/OpenSim.Region.ScriptEngine.Shared.csproj deleted file mode 100644 index 49506726c74..00000000000 --- a/OpenSim/Region/ScriptEngine/Shared/OpenSim.Region.ScriptEngine.Shared.csproj +++ /dev/null @@ -1,82 +0,0 @@ - - - net6.0 - OpenSim.Region.ScriptEngine.Shared - http://opensimulator.org - OpenSim - OpenSimulator developers - True - - - - ..\..\..\..\bin\OpenMetaverseTypes.dll - False - - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenSim/Region/ScriptEngine/YEngine/OpenSim.Region.ScriptEngine.YEngine.csproj b/OpenSim/Region/ScriptEngine/YEngine/OpenSim.Region.ScriptEngine.YEngine.csproj deleted file mode 100644 index f5d658936d5..00000000000 --- a/OpenSim/Region/ScriptEngine/YEngine/OpenSim.Region.ScriptEngine.YEngine.csproj +++ /dev/null @@ -1,41 +0,0 @@ - - - net6.0 - OpenSim.Region.ScriptEngine.YEngine - http://opensimulator.org - OpenSim - OpenSimulator developers - - - - - - - - - - ..\..\..\..\bin\OpenMetaverse.dll - False - - - ..\..\..\..\bin\OpenMetaverse.StructuredData.dll - False - - - ..\..\..\..\bin\OpenMetaverseTypes.dll - False - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenSim/Tools/Compiler/OpenSim.Tools.lslc.csproj b/OpenSim/Tools/Compiler/OpenSim.Tools.lslc.csproj index 17e5c6f374f..449b7c03503 100644 --- a/OpenSim/Tools/Compiler/OpenSim.Tools.lslc.csproj +++ b/OpenSim/Tools/Compiler/OpenSim.Tools.lslc.csproj @@ -24,7 +24,7 @@ - + diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/ApiManager.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/ApiManager.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/ApiManager.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/AsyncCommandManager.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/AsyncCommandManager.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/LSL_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/LSL_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/LS_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/LS_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/MOD_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/MOD_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/OSSL_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/OSSL_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/Dataserver.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/Dataserver.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/HttpRequest.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/HttpRequest.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/Listener.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/Listener.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/ScriptTimer.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/ScriptTimer.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/ScriptTimer.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/ScriptTimer.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/SensorRepeat.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/SensorRepeat.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/XmlRequest.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Implementation/Plugins/XmlRequest.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/ILSL_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/ILSL_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/ILS_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILS_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/ILS_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/IMOD_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/IMOD_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/IOSSL_Api.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Interface/IOSSL_Api.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/LSL_Constants.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/LSL_Constants.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/LSL_Stub.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/LSL_Stub.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/LS_Stub.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/LS_Stub.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/MOD_Stub.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/MOD_Stub.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Runtime/MOD_Stub.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/MOD_Stub.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/OSSL_Stub.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/OSSL_Stub.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/ScriptBase.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Api/Runtime/ScriptBase.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Helpers.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/Helpers.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Helpers.cs diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/ICompiler.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/ICompiler.cs diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScript.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScript.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Interfaces/IScript.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScript.cs diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScriptApi.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScriptApi.cs diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScriptEngine.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScriptEngine.cs diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScriptInstance.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/Interfaces/IScriptInstance.cs diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/Source/OpenSim.Region.ScriptEngine.Shared/LSL_Types.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/LSL_Types.cs diff --git a/Source/OpenSim.Region.ScriptEngine.Shared/OpenSim.Region.ScriptEngine.Shared.csproj b/Source/OpenSim.Region.ScriptEngine.Shared/OpenSim.Region.ScriptEngine.Shared.csproj new file mode 100644 index 00000000000..563840c4e35 --- /dev/null +++ b/Source/OpenSim.Region.ScriptEngine.Shared/OpenSim.Region.ScriptEngine.Shared.csproj @@ -0,0 +1,38 @@ + + + net6.0 + OpenSim.Region.ScriptEngine.Shared + http://opensimulator.org + OpenSim + OpenSimulator developers + True + + + + ..\..\bin\OpenMetaverse.dll + False + + + ..\..\bin\OpenMetaverseTypes.dll + False + + + ..\..\bin\OpenMetaverse.StructuredData.dll + False + + + + + + + + + + + + + + + + + diff --git a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs b/Source/OpenSim.Region.ScriptEngine.Shared/ScriptException.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/Shared/ScriptException.cs rename to Source/OpenSim.Region.ScriptEngine.Shared/ScriptException.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRDelegateCommon.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRDelegateCommon.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRDelegateCommon.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRDelegateCommon.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRIEventHandlers.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRIEventHandlers.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRIEventHandlers.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRIEventHandlers.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRInternalFuncDict.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRInternalFuncDict.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRInternalFuncDict.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRInternalFuncDict.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptBinOpStr.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptBinOpStr.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptBinOpStr.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptBinOpStr.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCodeGen.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptCodeGen.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCodeGen.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCollector.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptCollector.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCollector.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCompValu.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCompValu.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptCompValu.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCompValu.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptCompile.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCompile.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptCompile.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptCompile.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptConsts.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptConsts.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptConsts.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptConsts.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptEventCode.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptEventCode.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptEventCode.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptEventCode.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptInlines.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptInlines.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptInlines.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptInlines.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptMyILGen.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptMyILGen.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptMyILGen.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptMyILGen.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptObjCode.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjCode.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptObjCode.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjWriter.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptObjWriter.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptObjWriter.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptObjWriter.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptReduce.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptReduce.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptReduce.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptReduce.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptTokenize.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptTokenize.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptTokenize.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptTokenize.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptTypeCast.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptTypeCast.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptTypeCast.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptTypeCast.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/MMRScriptVarDict.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptVarDict.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/MMRScriptVarDict.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/MMRScriptVarDict.cs diff --git a/Source/OpenSim.Region.ScriptEngine.YEngine/OpenSim.Region.ScriptEngine.YEngine.csproj b/Source/OpenSim.Region.ScriptEngine.YEngine/OpenSim.Region.ScriptEngine.YEngine.csproj new file mode 100644 index 00000000000..92a8f2a684b --- /dev/null +++ b/Source/OpenSim.Region.ScriptEngine.YEngine/OpenSim.Region.ScriptEngine.YEngine.csproj @@ -0,0 +1,39 @@ + + + net6.0 + OpenSim.Region.ScriptEngine.YEngine + http://opensimulator.org + OpenSim + OpenSimulator developers + + + + + + + + + + ..\..\bin\OpenMetaverse.dll + False + + + ..\..\bin\OpenMetaverse.StructuredData.dll + False + + + ..\..\bin\OpenMetaverseTypes.dll + False + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRArray.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRArray.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRArray.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRArray.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMREngXmrTestLs.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMREngXmrTestLs.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMREngine.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMREngine.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMREvents.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMREvents.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMREvents.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRHeapTracker.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRHeapTracker.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRHeapTracker.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRHeapTracker.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstAbstract.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstAbstract.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstAbstract.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstAbstract.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstBackend.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstBackend.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstBackend.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstCapture.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstCapture.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstCapture.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstCtor.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstCtor.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstMain.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstMain.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstMain.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstMain.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstMisc.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstMisc.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstMisc.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstQueue.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstQueue.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstQueue.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstQueue.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstRun.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRInstRun.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRObjectTokens.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRObjectTokens.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRObjectTokens.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRObjectTokens.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRSDTypeClObj.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRSDTypeClObj.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRSDTypeClObj.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRSDTypeClObj.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRScriptThread.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRScriptThread.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRScriptThread.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRScriptThread.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMRScriptUThread.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/XMRScriptUThread.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/XMRScriptUThread.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/XMRScriptUThread.cs diff --git a/OpenSim/Region/ScriptEngine/YEngine/YEngineModule.cs b/Source/OpenSim.Region.ScriptEngine.YEngine/YEngineModule.cs similarity index 100% rename from OpenSim/Region/ScriptEngine/YEngine/YEngineModule.cs rename to Source/OpenSim.Region.ScriptEngine.YEngine/YEngineModule.cs diff --git a/Source/OpenSim.Server.MoneyServer/Program.cs b/Source/OpenSim.Server.MoneyServer/Program.cs index 11143a4945d..b348c67d243 100644 --- a/Source/OpenSim.Server.MoneyServer/Program.cs +++ b/Source/OpenSim.Server.MoneyServer/Program.cs @@ -76,14 +76,14 @@ private static void StartMoneyServer(string console, List inifile) .UseServiceProviderFactory(new AutofacServiceProviderFactory()) .ConfigureAppConfiguration(configuration => { - configuration.AddIniFile("MoneyServer.ini", optional: true, reloadOnChange: true); + configuration.AddIniFile("MoneyServer.ini", optional: true, reloadOnChange: false); foreach (var item in inifile) { - configuration.AddIniFile(item, optional: true, reloadOnChange: true); + configuration.AddIniFile(item, optional: true, reloadOnChange: false); } - configuration.EnableSubstitutions("$(", ")"); +// configuration.EnableSubstitutions("$(", ")"); }) .ConfigureContainer(builder => { @@ -107,8 +107,10 @@ private static void StartMoneyServer(string console, List inifile) services.AddHostedService(); }); - IHost host = builder.Build(); - host.Run(); + using var host = builder.Build(); + { + host.Run(); + } } } } diff --git a/Source/OpenSim.Server.RegionServer/OpenSim.Server.RegionServer.csproj b/Source/OpenSim.Server.RegionServer/OpenSim.Server.RegionServer.csproj index eede5da6241..1abc66be1f3 100644 --- a/Source/OpenSim.Server.RegionServer/OpenSim.Server.RegionServer.csproj +++ b/Source/OpenSim.Server.RegionServer/OpenSim.Server.RegionServer.csproj @@ -40,7 +40,7 @@ - + diff --git a/Tranquillity.sln b/Tranquillity.sln index d95a99c9a93..b67d6aa452d 100644 --- a/Tranquillity.sln +++ b/Tranquillity.sln @@ -73,17 +73,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.PhysicsModul EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.PhysicsModules.SharedBase", "OpenSim\Region\PhysicsModules\SharedBase\OpenSim.Region.PhysicsModules.SharedBase.csproj", "{EFA63A0B-0000-0000-0000-000000000000}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.Shared", "OpenSim\Region\ScriptEngine\Shared\OpenSim.Region.ScriptEngine.Shared.csproj", "{F93F91AD-0000-0000-0000-000000000000}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.Shared", "Source\OpenSim.Region.ScriptEngine.Shared\OpenSim.Region.ScriptEngine.Shared.csproj", "{F93F91AD-0000-0000-0000-000000000000}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.Shared.Api", "OpenSim\Region\ScriptEngine\Shared\Api\Implementation\OpenSim.Region.ScriptEngine.Shared.Api.csproj", "{C18E3417-0000-0000-0000-000000000000}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.Shared.Api.Runtime", "OpenSim\Region\ScriptEngine\Shared\Api\Runtime\OpenSim.Region.ScriptEngine.Shared.Api.Runtime.csproj", "{FC92C9C9-0000-0000-0000-000000000000}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.Shared.CodeTools", "OpenSim\Region\ScriptEngine\Shared\CodeTools\OpenSim.Region.ScriptEngine.Shared.CodeTools.csproj", "{1A7CAB35-0000-0000-0000-000000000000}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.Shared.Instance", "OpenSim\Region\ScriptEngine\Shared\Instance\OpenSim.Region.ScriptEngine.Shared.Instance.csproj", "{B185E548-0000-0000-0000-000000000000}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.YEngine", "OpenSim\Region\ScriptEngine\YEngine\OpenSim.Region.ScriptEngine.YEngine.csproj", "{798B4867-0000-0000-0000-000000000000}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.ScriptEngine.YEngine", "Source\OpenSim.Region.ScriptEngine.YEngine\OpenSim.Region.ScriptEngine.YEngine.csproj", "{798B4867-0000-0000-0000-000000000000}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Server.Base", "OpenSim\Server\Base\OpenSim.Server.Base.csproj", "{2E0569BB-0000-0000-0000-000000000000}" EndProject @@ -299,22 +291,6 @@ Global {F93F91AD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {F93F91AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {F93F91AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {C18E3417-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C18E3417-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C18E3417-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C18E3417-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {FC92C9C9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC92C9C9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC92C9C9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC92C9C9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {1A7CAB35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A7CAB35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A7CAB35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A7CAB35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU - {B185E548-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B185E548-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B185E548-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B185E548-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {798B4867-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {798B4867-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {798B4867-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj b/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj index d16b4c30341..e315e838fad 100644 --- a/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj +++ b/addon-modules/Gloebit/GloebitMoneyModule/Gloebit.csproj @@ -45,8 +45,7 @@ - - +