Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2 files changed, 41 insertions, 42 deletions

diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
index 5c50936..5004d99 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServicesConnector.cs
@@ -73,7 +73,6 @@ namespace OpenSim.Services.Connectors
             }
         }
 
-
         public virtual string Helo()
         {
             HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
@@ -82,10 +81,12 @@ namespace OpenSim.Services.Connectors
 
             try
             {
-                WebResponse response = req.GetResponse();
-                if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null
-                    return string.Empty;
-                return response.Headers.Get("X-Handlers-Provided");
+                using (WebResponse response = req.GetResponse())
+                {
+                    if (response.Headers.Get("X-Handlers-Provided") == null) // just in case this ever returns a null
+                        return string.Empty;
+                    return response.Headers.Get("X-Handlers-Provided");
+                }
             }
             catch (Exception e)
             {
@@ -95,6 +96,5 @@ namespace OpenSim.Services.Connectors
             // fail
             return string.Empty;
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index c542c29..d7e38f1 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -169,41 +169,45 @@ namespace OpenSim.Services.Connectors.Hypergrid
             // Let's wait for the response
             //m_log.Info("[USER AGENT CONNECTOR]: Waiting for a reply after DoCreateChildAgentCall");
 
-            WebResponse webResponse = null;
-            StreamReader sr = null;
             try
             {
-                webResponse = AgentCreateRequest.GetResponse();
-                if (webResponse == null)
+                using (WebResponse webResponse = AgentCreateRequest.GetResponse())
                 {
-                    m_log.Info("[USER AGENT CONNECTOR]: Null reply on DoCreateChildAgentCall post");
-                }
-                else
-                {
-
-                    sr = new StreamReader(webResponse.GetResponseStream());
-                    string response = sr.ReadToEnd().Trim();
-                    m_log.InfoFormat("[USER AGENT CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response);
-
-                    if (!String.IsNullOrEmpty(response))
+                    if (webResponse == null)
                     {
-                        try
-                        {
-                            // we assume we got an OSDMap back
-                            OSDMap r = Util.GetOSDMap(response);
-                            bool success = r["success"].AsBoolean();
-                            reason = r["reason"].AsString();
-                            return success;
-                        }
-                        catch (NullReferenceException e)
+                        m_log.Info("[USER AGENT CONNECTOR]: Null reply on DoCreateChildAgentCall post");
+                    }
+                    else
+                    {
+                        using (Stream s = webResponse.GetResponseStream())
                         {
-                            m_log.InfoFormat("[USER AGENT CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
-
-                            // check for old style response
-                            if (response.ToLower().StartsWith("true"))
-                                return true;
-
-                            return false;
+                            using (StreamReader sr = new StreamReader(s))
+                            {
+                                string response = sr.ReadToEnd().Trim();
+                                m_log.InfoFormat("[USER AGENT CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response);
+
+                                if (!String.IsNullOrEmpty(response))
+                                {
+                                    try
+                                    {
+                                        // we assume we got an OSDMap back
+                                        OSDMap r = Util.GetOSDMap(response);
+                                        bool success = r["success"].AsBoolean();
+                                        reason = r["reason"].AsString();
+                                        return success;
+                                    }
+                                    catch (NullReferenceException e)
+                                    {
+                                        m_log.InfoFormat("[USER AGENT CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
+
+                                        // check for old style response
+                                        if (response.ToLower().StartsWith("true"))
+                                            return true;
+
+                                        return false;
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -214,11 +218,6 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 reason = "Destination did not reply";
                 return false;
             }
-            finally
-            {
-                if (sr != null)
-                    sr.Close();
-            }
 
             return true;