diff options
| author | onefang | 2020-09-08 21:17:45 +1000 |
|---|---|---|
| committer | onefang | 2020-09-08 21:17:45 +1000 |
| commit | dcfd54b7608093d509cd045a152a4cde7317f66f (patch) | |
| tree | 593eb822c05a6d209707593732e7e0fac4984663 /OpenSim/Services/GridService/HypergridLinker.cs | |
| parent | Various database fixups. (diff) | |
| download | opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.zip opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.tar.gz opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.tar.bz2 opensim-SC-dcfd54b7608093d509cd045a152a4cde7317f66f.tar.xz | |
Move various paths out of the bin directory.
Diffstat (limited to '')
| -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 9c66e3d..4f5fe59 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -95,7 +95,8 @@ namespace OpenSim.Services.GridService | |||
| 95 | 95 | ||
| 96 | // m_Check4096 = gridConfig.GetBoolean("Check4096", true); | 96 | // m_Check4096 = gridConfig.GetBoolean("Check4096", true); |
| 97 | 97 | ||
| 98 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); | 98 | //// 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. |
| 99 | m_MapTileDirectory = Path.Combine(Util.cacheDir(), Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles"))); | ||
| 99 | 100 | ||
| 100 | m_ThisGatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 101 | m_ThisGatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
| 101 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | 102 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); |