From d256b29511810b08434f045d8507456594a52edc Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 20 Sep 2020 03:21:43 +0100 Subject: [PATCH] rename Yengine option ScriptBasePath as ScriptEnginesPath to match Xengine --- OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs | 8 +++++++- bin/OpenSimDefaults.ini | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs index dfa6617aa3..7b9ba54331 100644 --- a/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs +++ b/OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs @@ -298,7 +298,13 @@ namespace OpenSim.Region.ScriptEngine.Yengine m_Scene.RegisterModuleInterface(this); - m_ScriptBasePath = m_Config.GetString("ScriptBasePath", "ScriptEngines"); + m_ScriptBasePath = m_Config.GetString("ScriptEnginesPath"); + //look for old + if (string.IsNullOrWhiteSpace(m_ScriptBasePath)) + m_ScriptBasePath = m_Config.GetString("ScriptBasePath"); + if (string.IsNullOrWhiteSpace(m_ScriptBasePath)) + m_ScriptBasePath = "ScriptEngines"; + m_ScriptBasePath = Path.Combine(m_ScriptBasePath, "Yengine"); m_ScriptBasePath = Path.Combine(m_ScriptBasePath, scene.RegionInfo.RegionID.ToString()); diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 1053695e2d..3025c2da1c 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1768,7 +1768,7 @@ MinTimerInterval = 0.1 ; scripts states and cache parent folder location - ;ScriptBasePath="ScriptEngines" + ;ScriptEnginesPath="ScriptEngines" [XEngine]