ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify xbakes service a bit more

Browse Source
This commit is contained in:
UbitUmarov
2020-12-28 21:44:26 +00:00
parent e169b1b074
commit 5ecc264082
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Server/Handlers/BakedTextures/XBakes.cs
View File

@@ -75,7 +75,6 @@ namespace OpenSim.Server.Handlers.BakedTextures
try
{
byte[] content = File.ReadAllBytes(diskFile);
return content;
}
catch
@@ -84,7 +83,7 @@ namespace OpenSim.Server.Handlers.BakedTextures
return new byte[0];
}
public void Store(string id, string sdata)
public void Store(string id, byte[] data)
{
string file = HashToFile(id);
string diskFile = Path.Combine(m_FSBase, file);
@@ -92,9 +91,6 @@ namespace OpenSim.Server.Handlers.BakedTextures
Directory.CreateDirectory(Path.GetDirectoryName(diskFile));
File.Delete(diskFile);
byte[] data = Encoding.UTF8.GetBytes(sdata);
using (FileStream fs = File.Create(diskFile))
fs.Write(data, 0, data.Length);
}

5
OpenSim/Server/Handlers/BakedTextures/XBakesHandler.cs
View File

@@ -115,10 +115,9 @@ namespace OpenSim.Server.Handlers.BakedTextures
if (p.Length == 0)
return;
using (StreamReader sr = new StreamReader(httpRequest.InputStream))
m_BakesService.Store(p[0], sr.ReadToEnd());
byte[] data = ((MemoryStream)httpRequest.InputStream).ToArray();
httpRequest.InputStream.Dispose();
m_BakesService.Store(p[0], data);
}
public string[] SplitParams(string path)

2
OpenSim/Services/Interfaces/IBakedTextureService.cs
View File

@@ -33,6 +33,6 @@ namespace OpenSim.Services.Interfaces
public interface IBakedTextureService
{
byte[] Get(string id);
void Store(string id, string data);
void Store(string id, byte[] data);
}
}