diff options
author | David Walter Seikel | 2016-11-07 12:47:38 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-07 12:47:38 +1000 |
commit | e8d501d75074b3b8c3b01778afafb84c5a48291d (patch) | |
tree | 0c1db86bf1c97d6154475ed813462a45d76cb76e /OpenSim/Services | |
parent | Excess white space removal. (diff) | |
download | opensim-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.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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); |