OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shooting in the dark for solutions to the appearance problem

viewer-2-initial-appearance
Mic Bowman 2010-12-20 14:15:44 -08:00 committed by Diva Canto
parent c082254b9d
commit a6a136bd90
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Capabilities/Caps.cs
View File

@ -1344,6 +1344,12 @@ namespace OpenSim.Framework.Capabilities
/// <returns></returns> /// <returns></returns>
public string uploaderCaps(byte[] data, string path, string param) public string uploaderCaps(byte[] data, string path, string param)
{ {
handlerUpLoad = OnUpLoad;
if (handlerUpLoad != null)
{
Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); });
}
string res = String.Empty; string res = String.Empty;
LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
uploadComplete.new_asset = newAssetID.ToString(); uploadComplete.new_asset = newAssetID.ToString();
@ -1354,12 +1360,6 @@ namespace OpenSim.Framework.Capabilities
httpListener.RemoveStreamHandler("POST", uploaderPath); httpListener.RemoveStreamHandler("POST", uploaderPath);
handlerUpLoad = OnUpLoad;
if (handlerUpLoad != null)
{
handlerUpLoad(newAssetID, data);
}
m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID);
return res; return res;

4
OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
View File

@ -53,8 +53,8 @@ namespace OpenSim.Framework.Servers.HttpServer
private static byte[] ReadFully(Stream stream) private static byte[] ReadFully(Stream stream)
{ {
byte[] buffer = new byte[32768]; byte[] buffer = new byte[1024];
using (MemoryStream ms = new MemoryStream()) using (MemoryStream ms = new MemoryStream(1024*256))
{ {
while (true) while (true)
{ {