aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-11-07 12:47:38 +1000
committerDavid Walter Seikel2016-11-07 12:47:38 +1000
commite8d501d75074b3b8c3b01778afafb84c5a48291d (patch)
tree0c1db86bf1c97d6154475ed813462a45d76cb76e
parentExcess white space removal. (diff)
downloadopensim-SC_OLD-e8d501d75074b3b8c3b01778afafb84c5a48291d.zip
opensim-SC_OLD-e8d501d75074b3b8c3b01778afafb84c5a48291d.tar.gz
opensim-SC_OLD-e8d501d75074b3b8c3b01778afafb84c5a48291d.tar.bz2
opensim-SC_OLD-e8d501d75074b3b8c3b01778afafb84c5a48291d.tar.xz
More caches directory fixes, including moving console history there.
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs2
-rw-r--r--OpenSim/Framework/Console/LocalConsole.cs2
-rw-r--r--OpenSim/Server/Handlers/BakedTextures/XBakes.cs4
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs3
4 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
index 130a523..ea95696 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs
@@ -68,7 +68,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
68 } 68 }
69 69
70 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 70 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
71//// Causes hangs with the actual .ini files. 71//// Causes hangs with the actual .ini files if they are in the same place.
72//// string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini"); 72//// string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
73 73
74 // Create an empty Regions.ini if there are no existing config files. 74 // Create an empty Regions.ini if there are no existing config files.
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 28293c0..d8f8ecc 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
97 97
98 string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt"); 98 string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt");
99 int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100); 99 int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
100 m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile)); 100 m_historyPath = Path.GetFullPath(Path.Combine("../caches", m_historyFile));
101 m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath); 101 m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath);
102 102
103 if (File.Exists(m_historyPath)) 103 if (File.Exists(m_historyPath))
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
index a63c9a1..abcda62 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
@@ -70,9 +70,9 @@ namespace OpenSim.Server.Handlers.BakedTextures
70 m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); 70 m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty);
71 if (m_FSBase == String.Empty) 71 if (m_FSBase == String.Empty)
72 { 72 {
73 m_FSBase = "bakes"; 73 m_FSBase = "bakes";
74 } 74 }
75 m_FSBase = "../../caches/" + m_FSBase; 75 m_FSBase = "../caches/" + m_FSBase;
76 76
77 m_log.Info("[BAKES]: XBakes service enabled"); 77 m_log.Info("[BAKES]: XBakes service enabled");
78 } 78 }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 4df41cf..aebbf7c 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -119,7 +119,8 @@ namespace OpenSim.Services.GridService
119 if (scope != string.Empty) 119 if (scope != string.Empty)
120 UUID.TryParse(scope, out m_ScopeID); 120 UUID.TryParse(scope, out m_ScopeID);
121 121
122 m_MapTileDirectory = "../caches/" + gridConfig.GetString("MapTileDirectory", "maptiles"); 122// TODO OpenSim is crazy, this is called from Robust and OpenSim, Robust needs the ../caches bit, OpenSim somehow adds a path already. I can't tell why. So strip the path.
123 m_MapTileDirectory = "../caches/" + Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles"));
123 124
124 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 125 m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
125 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); 126 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);