From a6a136bd90735b5a15ebc91c8a2a310f7250ac94 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 20 Dec 2010 14:15:44 -0800
Subject: Shooting in the dark for solutions to the appearance problem

---
 OpenSim/Framework/Capabilities/Caps.cs                      | 12 ++++++------
 OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Framework')

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
             /// <returns></returns>
             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;
                 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
                 uploadComplete.new_asset = newAssetID.ToString();
@@ -1354,12 +1360,6 @@ namespace OpenSim.Framework.Capabilities
 
                 httpListener.RemoveStreamHandler("POST", uploaderPath);
 
-                handlerUpLoad = OnUpLoad;
-                if (handlerUpLoad != null)
-                {
-                    handlerUpLoad(newAssetID, data);
-                }
-
                 m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID);
 
                 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
 
         private static byte[] ReadFully(Stream stream)
         {
-            byte[] buffer = new byte[32768];
-            using (MemoryStream ms = new MemoryStream())
+            byte[] buffer = new byte[1024];
+            using (MemoryStream ms = new MemoryStream(1024*256))
             {
                 while (true)
                 {
-- 
cgit v1.1


From 25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Tue, 21 Dec 2010 19:15:44 -0500
Subject: * Adds AbortXfer to the ClientAPI mix * Adds an item that checks to
 see if the top request has been there for longer then 30 seconds without an
 update and sends an AbortXfer if it encounters one.   This allows the client
 to cancel the Xfer on it's side so you can re-select the prim and get the
 inventory when it fails the first time. * Some interesting locking...   
 Using NewFiles to lock the rest of them.   We'll see how that goes. * The
 goal of this is to ensure that Xfers are restartable when they fail.  The
 client will not do that on it's own.

---
 OpenSim/Framework/IClientAPI.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index b9c9323..6bca6eb 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1057,6 +1057,8 @@ namespace OpenSim.Framework
 
         void SendXferPacket(ulong xferID, uint packet, byte[] data);
 
+        void SendAbortXferPacket(ulong xferID);
+
         void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
                              int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent,
                              float PriceObjectScaleFactor,
-- 
cgit v1.1


From cf37b3b9434ca940fa635c0e951fa9ac7c07175a Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 22 Dec 2010 03:25:30 +0100
Subject: Prevent a null ref when an avatar login doesn't go as planned

---
 OpenSim/Framework/Watchdog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 9baf3a0..3389ecb 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Framework
                 m_threads.Add(threadInfo.Thread.ManagedThreadId, threadInfo);
         }
 
-        private static bool RemoveThread(int threadID)
+        public static bool RemoveThread(int threadID)
         {
             lock (m_threads)
                 return m_threads.Remove(threadID);
-- 
cgit v1.1