diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Server/Handlers/BakedTextures | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Server/Handlers/BakedTextures')
-rw-r--r-- | OpenSim/Server/Handlers/BakedTextures/XBakes.cs | 4 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs | 8 |
3 files changed, 6 insertions, 8 deletions
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 | |||
70 | m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); | 70 | m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); |
71 | if (m_FSBase == String.Empty) | 71 | if (m_FSBase == String.Empty) |
72 | { | 72 | { |
73 | m_FSBase = "bakes"; | 73 | m_log.ErrorFormat("[BAKES]: BaseDirectory not specified"); |
74 | throw new Exception("Configuration error"); | ||
74 | } | 75 | } |
75 | m_FSBase = "../caches/" + m_FSBase; | ||
76 | 76 | ||
77 | m_log.Info("[BAKES]: XBakes service enabled"); | 77 | m_log.Info("[BAKES]: XBakes service enabled"); |
78 | } | 78 | } |
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 | |||
61 | ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args); | 61 | ServerUtils.LoadPlugin<IBakedTextureService>(assetService, args); |
62 | 62 | ||
63 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); | 63 | IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); |
64 | 64 | ||
65 | server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth)); | 65 | server.AddStreamHandler(new BakesServerGetHandler(m_BakesService, auth)); |
66 | server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth)); | 66 | server.AddStreamHandler(new BakesServerPostHandler(m_BakesService, auth)); |
67 | } | 67 | } |
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 | |||
65 | return new byte[0]; | 65 | return new byte[0]; |
66 | } | 66 | } |
67 | 67 | ||
68 | StreamReader sr = new StreamReader(request); | 68 | using(StreamReader sr = new StreamReader(request)) |
69 | 69 | m_BakesService.Store(p[0],sr.ReadToEnd()); | |
70 | m_BakesService.Store(p[0], sr.ReadToEnd()); | ||
71 | sr.Close(); | ||
72 | 70 | ||
73 | return new byte[0]; | 71 | return new byte[0]; |
74 | } | 72 | } |
75 | } | 73 | } |
76 | } \ No newline at end of file | 74 | } |