From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 OpenSim/Server/Handlers/BakedTextures/XBakes.cs            | 4 ++--
 OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs     | 2 +-
 OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Server/Handlers/BakedTextures')

diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
index abcda62..4e55433 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs
@@ -70,9 +70,9 @@ namespace OpenSim.Server.Handlers.BakedTextures
             m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty);
             if (m_FSBase == String.Empty)
             {
-                m_FSBase = "bakes";
+                m_log.ErrorFormat("[BAKES]: BaseDirectory not specified");
+                throw new Exception("Configuration error");
             }
-            m_FSBase = "../caches/" + m_FSBase;
 
             m_log.Info("[BAKES]: XBakes service enabled");
         }
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
index 4c12967..4386a2d 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.BakedTextures
                     ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args);
 
             IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
-            
+
             server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth));
             server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth));
         }
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
index e38543b..d16000d 100644
--- a/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
+++ b/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
@@ -65,12 +65,10 @@ namespace OpenSim.Server.Handlers.BakedTextures
                 return new byte[0];
             }
 
-            StreamReader sr = new StreamReader(request);
-
-            m_BakesService.Store(p[0], sr.ReadToEnd());
-            sr.Close();
+            using(StreamReader sr = new StreamReader(request))
+                m_BakesService.Store(p[0],sr.ReadToEnd());
 
             return new byte[0];
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1