diff options
author | David Walter Seikel | 2016-11-05 10:39:00 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-05 10:39:00 +1000 |
commit | 1d73de086c1ebdaaed9848b6dc69b6998b99a2a7 (patch) | |
tree | e5fa8138d43eb4afe7b453642dc7d7b54a8264f5 | |
parent | White space removal. (diff) | |
download | opensim-SC_OLD-1d73de086c1ebdaaed9848b6dc69b6998b99a2a7.zip opensim-SC_OLD-1d73de086c1ebdaaed9848b6dc69b6998b99a2a7.tar.gz opensim-SC_OLD-1d73de086c1ebdaaed9848b6dc69b6998b99a2a7.tar.bz2 opensim-SC_OLD-1d73de086c1ebdaaed9848b6dc69b6998b99a2a7.tar.xz |
Fix up maptiles location.
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 5c9dd78..d1ff4f2 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -119,8 +119,7 @@ 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 | 122 | m_MapTileDirectory = "../caches/" + gridConfig.GetString("MapTileDirectory", "maptiles"); | |
123 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); | ||
124 | 123 | ||
125 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 124 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
126 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | 125 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); |
@@ -139,17 +138,14 @@ namespace OpenSim.Services.GridService | |||
139 | 138 | ||
140 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); | 139 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); |
141 | 140 | ||
142 | if (!string.IsNullOrEmpty(m_MapTileDirectory)) | 141 | try |
143 | { | 142 | { |
144 | try | 143 | Directory.CreateDirectory(m_MapTileDirectory); |
145 | { | 144 | } |
146 | Directory.CreateDirectory(m_MapTileDirectory); | 145 | catch (Exception e) |
147 | } | 146 | { |
148 | catch (Exception e) | 147 | m_log.WarnFormat("[HYPERGRID LINKER]: Could not create map tile storage directory {0}: {1}", m_MapTileDirectory, e); |
149 | { | 148 | m_MapTileDirectory = string.Empty; |
150 | m_log.WarnFormat("[HYPERGRID LINKER]: Could not create map tile storage directory {0}: {1}", m_MapTileDirectory, e); | ||
151 | m_MapTileDirectory = string.Empty; | ||
152 | } | ||
153 | } | 149 | } |
154 | 150 | ||
155 | if (MainConsole.Instance != null) | 151 | if (MainConsole.Instance != null) |