From dcfd54b7608093d509cd045a152a4cde7317f66f Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 8 Sep 2020 21:17:45 +1000 Subject: Move various paths out of the bin directory. --- OpenSim/Region/Application/ConfigurationLoader.cs | 5 ++--- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 +- OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 8 +++++++- OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs | 4 ++-- OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs | 2 +- OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 66e46cb..02a9941 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -153,15 +153,14 @@ namespace OpenSim } // Override distro settings with contents of inidirectory - string iniDirName = startupConfig.GetString("inidirectory", "config"); - string iniDirPath = Path.Combine(Util.configDir(), iniDirName); + string iniDirPath = startupConfig.GetString("inidirectory", Util.configDir()); if (Directory.Exists(iniDirPath)) { m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); List overrideSources = new List(); - string[] fileEntries = Directory.GetFiles(iniDirName); + string[] fileEntries = Directory.GetFiles(iniDirPath); foreach (string filePath in fileEntries) { if (Path.GetExtension(filePath).ToLower() == ".ini") diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index bbf7be7..238fbab 100755 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Asset private bool m_cleanupRunning; private const string m_ModuleName = "FlotsamAssetCache"; - private const string m_DefaultCacheDirectory = "./assetcache"; + private const string m_DefaultCacheDirectory = "assetcache"; private string m_CacheDirectory = m_DefaultCacheDirectory; private readonly List m_InvalidChars = new List(); diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 4c922ba..ce5e167 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -83,6 +83,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap private bool m_texturePrims = true; // true if should texture the rendered prims private float m_texturePrimSize = 48f; // size of prim before we consider texturing it private bool m_renderMeshes = false; // true if to render meshes rather than just bounding boxes + private String m_cacheDirectory = ""; private float m_renderMinHeight = -100f; private float m_renderMaxHeight = 4096f; @@ -119,6 +120,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap Util.GetConfigVarFromSections(m_config, "TexturePrimSize", configSections, m_texturePrimSize); m_renderMeshes = Util.GetConfigVarFromSections(m_config, "RenderMeshes", configSections, m_renderMeshes); + m_cacheDirectory + = Util.GetConfigVarFromSections(m_config, "CacheDirectory", configSections, System.IO.Path.Combine(Util.cacheDir(), "MapImageCache")); + + if (!Directory.Exists(m_cacheDirectory)) + Directory.CreateDirectory(m_cacheDirectory); m_renderMaxHeight = Util.GetConfigVarFromSections(m_config, "RenderMaxHeight", configSections, m_renderMaxHeight); m_renderMinHeight = Util.GetConfigVarFromSections(m_config, "RenderMinHeight", configSections, m_renderMinHeight); @@ -210,7 +216,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap Bitmap tile = GenImage(); // image may be reloaded elsewhere, so no compression format - string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png"; + string filename = System.IO.Path.Combine(m_cacheDirectory,"MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png"); tile.Save(filename, ImageFormat.Png); m_primMesher = null; return tile; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs index c15b194..f76b057 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs @@ -96,7 +96,7 @@ namespace OpenSim.Region.UserStatistics //IConfig startupConfig = config.Configs["Startup"]; - dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3"); + dbConn = new SqliteConnection("URI=file:" + Util.dbDir() + "/LocalUserStatistics.db,version=3"); dbConn.Open(); CreateTables(dbConn); @@ -1200,4 +1200,4 @@ VALUES m_scriptLinesPerSecond = stats.ExtraStatsBlock[0].StatValue; } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs index de39d0e..93c2986 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs @@ -99,7 +99,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing IConfig mesh_config = source.Configs["Mesh"]; - decodedSculptMapPath = config.GetString("DecodedSculptMapPath", "j2kDecodeCache"); + decodedSculptMapPath = config.GetString("DecodedSculptMapPath", System.IO.Path.Combine(Util.cacheDir(), "j2kDecodeCache")); cacheSculptMaps = config.GetBoolean("CacheSculptMaps", cacheSculptMaps); if (mesh_config != null) { diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index ac32f75..66c376c 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -64,7 +64,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing public bool doMeshFileCache = true; public bool doCacheExpire = true; - public string cachePath = "MeshCache"; + public string cachePath = System.IO.Path.Combine(Util.cacheDir(), "MeshCache"); public TimeSpan CacheExpire; // const string baseDir = "rawFiles"; diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs index e35f79f..6c42e2e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs +++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared string dirName = myDomain.FriendlyName; string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath; - string[] pathList = new string[] {"", "bin", ScriptEnginesPath, + string[] pathList = new string[] {"", "caches", ScriptEnginesPath, Path.Combine(ScriptEnginesPath, dirName)}; string assemblyName = args.Name; diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 9e47530..b225aad 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_WaitForEventCompletionOnScriptStop = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); - m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); + m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", Path.Combine(Util.cacheDir(), "ScriptEngines")); m_Prio = ThreadPriority.BelowNormal; switch (priority) -- cgit v1.1