From 1d73de086c1ebdaaed9848b6dc69b6998b99a2a7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 5 Nov 2016 10:39:00 +1000
Subject: Fix up maptiles location.

---
 OpenSim/Services/GridService/HypergridLinker.cs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

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
             if (scope != string.Empty)
                 UUID.TryParse(scope, out m_ScopeID);
 
-
-            m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
+            m_MapTileDirectory = "../caches/" + gridConfig.GetString("MapTileDirectory", "maptiles");
 
             m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
@@ -139,17 +138,14 @@ namespace OpenSim.Services.GridService
 
             m_log.Debug("[HYPERGRID LINKER]: Loaded all services...");
 
-            if (!string.IsNullOrEmpty(m_MapTileDirectory))
+            try
             {
-                try
-                {
-                    Directory.CreateDirectory(m_MapTileDirectory);
-                }
-                catch (Exception e)
-                {
-                    m_log.WarnFormat("[HYPERGRID LINKER]: Could not create map tile storage directory {0}: {1}", m_MapTileDirectory, e);
-                    m_MapTileDirectory = string.Empty;
-                }
+                Directory.CreateDirectory(m_MapTileDirectory);
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[HYPERGRID LINKER]: Could not create map tile storage directory {0}: {1}", m_MapTileDirectory, e);
+                m_MapTileDirectory = string.Empty;
             }
 
             if (MainConsole.Instance != null)
-- 
cgit v1.1