7 files changed, 79 insertions, 35 deletions

diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 42c0b18..ce36fbf 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -326,18 +326,22 @@ namespace OpenSim.Framework.Communications
                         m_log.Debug(e.ToString());
                     }
 
+                    if (_response != null)
+                        _response.Close();
+
                     return null;
                 }
 
-                Stream src = _response.GetResponseStream();
-                int length = src.Read(_readbuf, 0, BufferSize);
-                while (length > 0)
+                using (Stream src = _response.GetResponseStream())
                 {
-                    _resource.Write(_readbuf, 0, length);
-                    length = src.Read(_readbuf, 0, BufferSize);
+                    int length = src.Read(_readbuf, 0, BufferSize);
+                    while (length > 0)
+                    {
+                        _resource.Write(_readbuf, 0, length);
+                        length = src.Read(_readbuf, 0, BufferSize);
+                    }
                 }
 
-
                 // TODO! Implement timeout, without killing the server
                 // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
                 //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
@@ -372,20 +376,26 @@ namespace OpenSim.Framework.Communications
             m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
             src.Seek(0, SeekOrigin.Begin);
             m_log.Info("[REST]: Seek is ok");
-            Stream dst = _request.GetRequestStream();
-            m_log.Info("[REST]: GetRequestStream is ok");
 
-            byte[] buf = new byte[1024];
-            int length = src.Read(buf, 0, 1024);
-            m_log.Info("[REST]: First Read is ok");
-            while (length > 0)
+            using (Stream dst = _request.GetRequestStream())
             {
-                dst.Write(buf, 0, length);
-                length = src.Read(buf, 0, 1024);
+                m_log.Info("[REST]: GetRequestStream is ok");
+
+                byte[] buf = new byte[1024];
+                int length = src.Read(buf, 0, 1024);
+                m_log.Info("[REST]: First Read is ok");
+                while (length > 0)
+                {
+                    dst.Write(buf, 0, length);
+                    length = src.Read(buf, 0, 1024);
+                }
             }
 
             _response = (HttpWebResponse) _request.GetResponse();
 
+            if (_response != null)
+                _response.Close();
+
 //            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
 
             // TODO! Implement timeout, without killing the server
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 3a4e5df..6215055 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -75,6 +75,7 @@ namespace OpenSim
                 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
             ServicePointManager.DefaultConnectionLimit = 12;
+            ServicePointManager.UseNagleAlgorithm = false;
 
             // Add the arguments supplied when running the application to the configuration
             ArgvConfigSource configSource = new ArgvConfigSource(args);
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index d359ebc..db8405b 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1239,19 +1239,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
-            Stream rstream = webResponse.GetResponseStream();
-              
             OSDMap mret = new OSDMap();
-            try
-            {
-                mret = (OSDMap)OSDParser.DeserializeJson(rstream);
-            }
-            catch (Exception e)
+
+            using (Stream rstream = webResponse.GetResponseStream())
             {
-                m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
-                return false;
+                try
+                {
+                    mret = (OSDMap)OSDParser.DeserializeJson(rstream);
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
+                    if (webResponse != null)
+                        webResponse.Close();
+                    return false;
+                }
             }
 
+            if (webResponse != null)
+                webResponse.Close();
 
             if (mret.ContainsKey("error"))
                 return false;
@@ -1315,19 +1321,26 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
                 return false;
             }
 
-            Stream rstream = webResponse.GetResponseStream();
-
             OSDMap response = new OSDMap();
-            try
-            {
-                response = (OSDMap)OSDParser.DeserializeJson(rstream);
-            }
-            catch (Exception e)
+
+            using (Stream rstream = webResponse.GetResponseStream())
             {
-                m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
-                return false;
+                try
+                {
+                    response = (OSDMap)OSDParser.DeserializeJson(rstream);
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
+                    if (webResponse != null)
+                        webResponse.Close();
+                    return false;
+                }
             }
 
+            if (webResponse != null)
+                webResponse.Close();
+
             if(response.ContainsKey("error"))
             {
                 data = response["error"];
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 19c068a..b735f36 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -868,6 +868,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Let's send a full update of the agent. This is a synchronous call.
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
+
+            if ((teleportFlags & (uint)TeleportFlags.IsFlying) != 0)
+                agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
+
             agent.Position = agentCircuit.startpos;
             SetCallbackURL(agent, sp.Scene.RegionInfo);
 
@@ -1109,6 +1113,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
             agent.Position = agentCircuit.startpos;
+
+            if ((teleportFlags & (uint)TeleportFlags.IsFlying) != 0)
+                agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
+
             agent.SenderWantsToWaitForRoot = true;
             //SetCallbackURL(agent, sp.Scene.RegionInfo);
 
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 0c0a7aa..78c050a 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -391,6 +391,7 @@ namespace OpenSim.Region.DataSnapshot
                 {
                     m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
                 }
+
                 byte[] response = new byte[1024];
                 // int n = 0;
                 try
@@ -405,6 +406,9 @@ namespace OpenSim.Region.DataSnapshot
                 // This is not quite working, so...
                 // string responseStr = Util.UTF8.GetString(response);
                 m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
+
+                if(reply != null)
+                    reply.Close();
             }
 
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fd1bab6..9d06c26 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4268,14 +4268,17 @@ namespace OpenSim.Region.Framework.Scenes
                 GodLevel = cAgent.GodLevel;
             SetAlwaysRun = cAgent.AlwaysRun;
 
+
             Appearance = new AvatarAppearance(cAgent.Appearance);
+/*
+            bool isFlying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); 
+
             if (PhysicsActor != null)
             {
-                bool isFlying = Flying;
                 RemoveFromPhysicalScene();
                 AddToPhysicalScene(isFlying);
             }
-            
+*/            
             try
             {
                 lock (scriptedcontrols)
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index bf0cc35..9b0ebcf 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -284,9 +284,11 @@ namespace OpenSim.Services.Connectors
                 byte[] ret = new byte[s.Length];
                 s.Read(ret, 0, (int)s.Length);
 
+                s.Close();
                 return ret;
             }
 
+            s.Close();
             return null;
         }
 
@@ -325,13 +327,16 @@ namespace OpenSim.Services.Connectors
                             handlers = m_AssetHandlers[id];
                             m_AssetHandlers.Remove(id);
                         }
+
                         foreach (AssetRetrievedEx h in handlers)
                         {
                             Util.FireAndForget(x =>
                             {
-                                h.Invoke(a);
+                                try { h.Invoke(a); }
+                                catch { }
                             });
                         }
+
                         if (handlers != null)
                             handlers.Clear();