aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs12
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs4
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 63e1e34..dbb0781 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -1344,6 +1344,12 @@ namespace OpenSim.Framework.Capabilities
1344 /// <returns></returns> 1344 /// <returns></returns>
1345 public string uploaderCaps(byte[] data, string path, string param) 1345 public string uploaderCaps(byte[] data, string path, string param)
1346 { 1346 {
1347 handlerUpLoad = OnUpLoad;
1348 if (handlerUpLoad != null)
1349 {
1350 Util.FireAndForget(delegate(object o) { handlerUpLoad(newAssetID, data); });
1351 }
1352
1347 string res = String.Empty; 1353 string res = String.Empty;
1348 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 1354 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
1349 uploadComplete.new_asset = newAssetID.ToString(); 1355 uploadComplete.new_asset = newAssetID.ToString();
@@ -1354,12 +1360,6 @@ namespace OpenSim.Framework.Capabilities
1354 1360
1355 httpListener.RemoveStreamHandler("POST", uploaderPath); 1361 httpListener.RemoveStreamHandler("POST", uploaderPath);
1356 1362
1357 handlerUpLoad = OnUpLoad;
1358 if (handlerUpLoad != null)
1359 {
1360 handlerUpLoad(newAssetID, data);
1361 }
1362
1363 m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); 1363 m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID);
1364 1364
1365 return res; 1365 return res;
diff --git a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
index 86fa44d..bae4e1b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Framework.Servers.HttpServer
53 53
54 private static byte[] ReadFully(Stream stream) 54 private static byte[] ReadFully(Stream stream)
55 { 55 {
56 byte[] buffer = new byte[32768]; 56 byte[] buffer = new byte[1024];
57 using (MemoryStream ms = new MemoryStream()) 57 using (MemoryStream ms = new MemoryStream(1024*256))
58 { 58 {
59 while (true) 59 while (true)
60 { 60 {