Move various paths out of the bin directory.

2 files changed, 3 insertions, 2 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
 
 //                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
 
-            m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
+//// 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.
+            m_MapTileDirectory = Path.Combine(Util.cacheDir(), Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles")));
 
             m_ThisGatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 30d3e41..9c5e0bb 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Services.MapImageService
         private const int HALF_WIDTH = 128;
         private const int JPEG_QUALITY = 80;
 
-        private static string m_TilesStoragePath = "maptiles";
+        private static string m_TilesStoragePath = Path.Combine(Util.cacheDir(), "/maptiles");
 
         private static object m_Sync = new object();
         private static bool m_Initialized = false;