Move the terrain.raw file out of tree to a sim specific name.

1 files changed, 13 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 00c77d7..71c2eeb 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1373,15 +1373,24 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if (terr != null)
             {
+                string file = Util.cacheDir() + "/terrain_";
+                try
+                {
+                    file = file + Uri.EscapeDataString(Scene.Name) + ".raw";
+                }
+                catch (Exception)
+                {
+                    file = file + ".raw";
+                }
 //                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
-                if (File.Exists(Util.dataDir() + "/terrain.raw"))
+                if (File.Exists(file))
                 {
-                    File.Delete(Util.dataDir() + "/terrain.raw");
+                    File.Delete(file);
                 }
-                terr.SaveToFile(Util.dataDir() + "/terrain.raw");
+                terr.SaveToFile(file);
 
                 byte[] bdata;
-                using(FileStream input = new FileStream(Util.dataDir() + "/terrain.raw",FileMode.Open))
+                using(FileStream input = new FileStream(file, FileMode.Open))
                 {
                     bdata = new byte[input.Length];
                     input.Read(bdata, 0, (int)input.Length);