diff options
author | David Walter Seikel | 2016-11-04 00:46:34 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-04 00:46:34 +1000 |
commit | 58783a5216b81863988110174229a65ceb315e1e (patch) | |
tree | 74d08dcd7e127f288cd7a8026c776385a738d484 /OpenSim | |
parent | Even OpenSim removed the silly IAR avatar presence check. Purge it with fire. (diff) | |
download | opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.zip opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.tar.gz opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.tar.bz2 opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.tar.xz |
Attempt to move everything writable, and the configs, out of the bin directory.
Log configs are still in the bin directory.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Tests/BasicDataServiceTest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/Tests/Resources/TestDataConnections.ini | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 | ||||
-rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 | ||||
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/MapImageService/MapImageService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Robust/Server/DemonServer.cs | 4 |
13 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index f0dda64..30b26c4 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Data.SQLite | |||
86 | 86 | ||
87 | if (dbconnect == string.Empty) | 87 | if (dbconnect == string.Empty) |
88 | { | 88 | { |
89 | dbconnect = "URI=file:Asset.db,version=3"; | 89 | dbconnect = "URI=file:../db/Asset.db,version=3"; |
90 | } | 90 | } |
91 | m_conn = new SqliteConnection(dbconnect); | 91 | m_conn = new SqliteConnection(dbconnect); |
92 | m_conn.Open(); | 92 | m_conn.Open(); |
@@ -358,7 +358,7 @@ namespace OpenSim.Data.SQLite | |||
358 | /// </summary> | 358 | /// </summary> |
359 | override public void Initialise() | 359 | override public void Initialise() |
360 | { | 360 | { |
361 | Initialise("URI=file:Asset.db,version=3"); | 361 | Initialise("URI=file:../db/Asset.db,version=3"); |
362 | } | 362 | } |
363 | 363 | ||
364 | /// <summary> | 364 | /// <summary> |
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 7d493ca..7caf347 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -82,7 +82,7 @@ namespace OpenSim.Data.SQLite | |||
82 | 82 | ||
83 | if (dbconnect == string.Empty) | 83 | if (dbconnect == string.Empty) |
84 | { | 84 | { |
85 | dbconnect = "URI=file:inventoryStore.db,version=3"; | 85 | dbconnect = "URI=file:../db/inventoryStore.db,version=3"; |
86 | } | 86 | } |
87 | m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); | 87 | m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); |
88 | conn = new SqliteConnection(dbconnect); | 88 | conn = new SqliteConnection(dbconnect); |
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs index acfebd0..8c296b9 100644 --- a/OpenSim/Data/Tests/BasicDataServiceTest.cs +++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs | |||
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests | |||
106 | if (String.IsNullOrEmpty(m_connStr)) | 106 | if (String.IsNullOrEmpty(m_connStr)) |
107 | { | 107 | { |
108 | m_file = Path.GetTempFileName() + ".db"; | 108 | m_file = Path.GetTempFileName() + ".db"; |
109 | m_connStr = "URI=file:" + m_file + ",version=3"; | 109 | m_connStr = "URI=file:../db/" + m_file + ",version=3"; |
110 | } | 110 | } |
111 | } | 111 | } |
112 | 112 | ||
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini index 7b55467..75f7855 100644 --- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini +++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini | |||
@@ -16,9 +16,9 @@ | |||
16 | ; file for the DB. If you want the resulting DB to persist (e.g. for performance testing, | 16 | ; file for the DB. If you want the resulting DB to persist (e.g. for performance testing, |
17 | ; when filling up the tables can take a long time), explicitly specify a conn string like this: | 17 | ; when filling up the tables can take a long time), explicitly specify a conn string like this: |
18 | 18 | ||
19 | ; SqliteConnection="URI=file:<path_to_your_file>,version=3" | 19 | ; SqliteConnection="URI=file:../db/<path_to_your_file>,version=3" |
20 | 20 | ||
21 | [TestConnections] | 21 | [TestConnections] |
22 | MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;" | 22 | MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;" |
23 | SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;" | 23 | SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;" |
24 | SqliteConnection="URI=file:opensim-nunit.db,version=3" \ No newline at end of file | 24 | SqliteConnection="URI=file:../db/opensim-nunit.db,version=3" \ No newline at end of file |
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 1f74168..b5c3e75 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -987,7 +987,7 @@ namespace OpenSim.Framework | |||
987 | 987 | ||
988 | public static string configDir() | 988 | public static string configDir() |
989 | { | 989 | { |
990 | return "."; | 990 | return "../config"; |
991 | } | 991 | } |
992 | 992 | ||
993 | public static string dataDir() | 993 | public static string dataDir() |
@@ -1005,7 +1005,7 @@ namespace OpenSim.Framework | |||
1005 | } | 1005 | } |
1006 | } | 1006 | } |
1007 | 1007 | ||
1008 | return "./OpenSim.log"; | 1008 | return "../logs/OpenSim.log"; |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | public static string logDir() | 1011 | public static string logDir() |
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 7d9c9a9..82c95c2 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
64 | private bool m_Enabled; | 64 | private bool m_Enabled; |
65 | 65 | ||
66 | private const string m_ModuleName = "FlotsamAssetCache"; | 66 | private const string m_ModuleName = "FlotsamAssetCache"; |
67 | private const string m_DefaultCacheDirectory = "./assetcache"; | 67 | private const string m_DefaultCacheDirectory = "../caches/assetcache"; |
68 | private string m_CacheDirectory = m_DefaultCacheDirectory; | 68 | private string m_CacheDirectory = m_DefaultCacheDirectory; |
69 | 69 | ||
70 | private readonly List<char> m_InvalidChars = new List<char>(); | 70 | private readonly List<char> m_InvalidChars = new List<char>(); |
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs index bcb6361..f6772db 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.Region.UserStatistics | |||
96 | 96 | ||
97 | //IConfig startupConfig = config.Configs["Startup"]; | 97 | //IConfig startupConfig = config.Configs["Startup"]; |
98 | 98 | ||
99 | dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3"); | 99 | dbConn = new SqliteConnection("URI=file:../db/LocalUserStatistics.db,version=3"); |
100 | dbConn.Open(); | 100 | dbConn.Open(); |
101 | CreateTables(dbConn); | 101 | CreateTables(dbConn); |
102 | 102 | ||
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs index 4d25bf3..3a944d1 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs | |||
@@ -99,7 +99,7 @@ namespace OpenSim.Region.PhysicsModules.Meshing | |||
99 | 99 | ||
100 | IConfig mesh_config = source.Configs["Mesh"]; | 100 | IConfig mesh_config = source.Configs["Mesh"]; |
101 | 101 | ||
102 | decodedSculptMapPath = config.GetString("DecodedSculptMapPath", "j2kDecodeCache"); | 102 | decodedSculptMapPath = "../caches/" + config.GetString("DecodedSculptMapPath", "j2kDecodeCache"); |
103 | cacheSculptMaps = config.GetBoolean("CacheSculptMaps", cacheSculptMaps); | 103 | cacheSculptMaps = config.GetBoolean("CacheSculptMaps", cacheSculptMaps); |
104 | if (mesh_config != null) | 104 | if (mesh_config != null) |
105 | { | 105 | { |
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 | |||
44 | string dirName = myDomain.FriendlyName; | 44 | string dirName = myDomain.FriendlyName; |
45 | string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath; | 45 | string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath; |
46 | 46 | ||
47 | string[] pathList = new string[] {"", "bin", ScriptEnginesPath, | 47 | string[] pathList = new string[] {"", "caches", ScriptEnginesPath, |
48 | Path.Combine(ScriptEnginesPath, dirName)}; | 48 | Path.Combine(ScriptEnginesPath, dirName)}; |
49 | 49 | ||
50 | string assemblyName = args.Name; | 50 | string assemblyName = args.Name; |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 78d4ee9..6df36f7 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
309 | m_WaitForEventCompletionOnScriptStop | 309 | m_WaitForEventCompletionOnScriptStop |
310 | = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); | 310 | = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); |
311 | 311 | ||
312 | m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); | 312 | m_ScriptEnginesPath = "../caches/" + m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); |
313 | 313 | ||
314 | m_Prio = ThreadPriority.BelowNormal; | 314 | m_Prio = ThreadPriority.BelowNormal; |
315 | switch (priority) | 315 | switch (priority) |
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1817 | if (!(sender is System.AppDomain)) | 1817 | if (!(sender is System.AppDomain)) |
1818 | return null; | 1818 | return null; |
1819 | 1819 | ||
1820 | string[] pathList = new string[] {"bin", m_ScriptEnginesPath, | 1820 | string[] pathList = new string[] {"caches", m_ScriptEnginesPath, |
1821 | Path.Combine(m_ScriptEnginesPath, | 1821 | Path.Combine(m_ScriptEnginesPath, |
1822 | m_Scene.RegionInfo.RegionID.ToString())}; | 1822 | m_Scene.RegionInfo.RegionID.ToString())}; |
1823 | 1823 | ||
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 1f2c54d..40cec08 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Base | |||
85 | string fileName = ""; | 85 | string fileName = ""; |
86 | if (Assembly.GetEntryAssembly() != null) | 86 | if (Assembly.GetEntryAssembly() != null) |
87 | fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); | 87 | fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); |
88 | string iniFile = fileName + ".ini"; | 88 | string iniFile = "../config/" + fileName + ".ini"; |
89 | string logConfig = null; | 89 | string logConfig = null; |
90 | 90 | ||
91 | IConfig startupConfig = argvConfig.Configs["Startup"]; | 91 | IConfig startupConfig = argvConfig.Configs["Startup"]; |
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index a816411..6b4a91a 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Services.MapImageService | |||
80 | IConfig serviceConfig = config.Configs["MapImageService"]; | 80 | IConfig serviceConfig = config.Configs["MapImageService"]; |
81 | if (serviceConfig != null) | 81 | if (serviceConfig != null) |
82 | { | 82 | { |
83 | m_TilesStoragePath = serviceConfig.GetString("TilesStoragePath", m_TilesStoragePath); | 83 | m_TilesStoragePath = "../caches/" + serviceConfig.GetString("TilesStoragePath", m_TilesStoragePath); |
84 | if (!Directory.Exists(m_TilesStoragePath)) | 84 | if (!Directory.Exists(m_TilesStoragePath)) |
85 | Directory.CreateDirectory(m_TilesStoragePath); | 85 | Directory.CreateDirectory(m_TilesStoragePath); |
86 | 86 | ||
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs index 1e0797e..205abfb 100644 --- a/OpenSim/Tests/Robust/Server/DemonServer.cs +++ b/OpenSim/Tests/Robust/Server/DemonServer.cs | |||
@@ -48,8 +48,8 @@ namespace Robust.Tests | |||
48 | [SetUp] | 48 | [SetUp] |
49 | public void StartDemon() | 49 | public void StartDemon() |
50 | { | 50 | { |
51 | if (File.Exists("Robust.Tests.log")) | 51 | if (File.Exists("../logs/Robust.Tests.log")) |
52 | File.Delete("Robust.Tests.log"); | 52 | File.Delete("../logs/Robust.Tests.log"); |
53 | 53 | ||
54 | Console.WriteLine("**** Starting demon Robust server ****"); | 54 | Console.WriteLine("**** Starting demon Robust server ****"); |
55 | m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"})); | 55 | m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"})); |