Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 30 insertions, 26 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index d45962f..673a453 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             return false;
         }
 
-        public void GetDrawStringSize(string text, string fontName, int fontSize, 
+        public void GetDrawStringSize(string text, string fontName, int fontSize,
                                       out double xSize, out double ySize)
         {
             xSize = 0;
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
         {
             if (m_scene == null)
                 m_scene = scene;
-            
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -166,15 +166,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
             request.AllowAutoRedirect = false;
-            
-            if (!string.IsNullOrEmpty(m_proxyurl)) 
+
+            if (!string.IsNullOrEmpty(m_proxyurl))
             {
-                if (!string.IsNullOrEmpty(m_proxyexcepts)) 
+                if (!string.IsNullOrEmpty(m_proxyexcepts))
                 {
                     string[] elist = m_proxyexcepts.Split(';');
                     request.Proxy = new WebProxy(m_proxyurl, true, elist);
-                } 
-                else 
+                }
+                else
                 {
                     request.Proxy = new WebProxy(m_proxyurl, true);
                 }
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                             {
                                 imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
                             }
-                        } 
+                        }
                         catch (Exception)
                         {
                             m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Conversion Failed.  Empty byte data returned!");
@@ -268,33 +268,37 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             catch (WebException)
             {
             }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[LOADIMAGEURLMODULE]: unexpected exception {0}", e.Message);
+            }
             finally
             {
                 if (stream != null)
                     stream.Close();
 
                 if (response != null)
-                    response.Close();
-
-                if (
-                    response.StatusCode == HttpStatusCode.MovedPermanently
-                        || response.StatusCode == HttpStatusCode.Found
-                        || response.StatusCode == HttpStatusCode.SeeOther
-                        || response.StatusCode == HttpStatusCode.TemporaryRedirect)
                 {
-                    string redirectedUrl = response.Headers["Location"];
+                    if (response.StatusCode == HttpStatusCode.MovedPermanently
+                            || response.StatusCode == HttpStatusCode.Found
+                            || response.StatusCode == HttpStatusCode.SeeOther
+                            || response.StatusCode == HttpStatusCode.TemporaryRedirect)
+                    {
+                        string redirectedUrl = response.Headers["Location"];
 
-                    MakeHttpRequest(redirectedUrl, state.RequestID);
-                }
-                else
-                {
-                    m_log.DebugFormat("[LOADIMAGEURLMODULE]: Returning {0} bytes of image data for request {1}",
-                                      imageJ2000.Length, state.RequestID);
+                        MakeHttpRequest(redirectedUrl, state.RequestID);
+                    }
+                    else
+                    {
+                        m_log.DebugFormat("[LOADIMAGEURLMODULE]: Returning {0} bytes of image data for request {1}",
+                                          imageJ2000.Length, state.RequestID);
 
-                    m_textureManager.ReturnData(
-                        state.RequestID,
-                        new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
-                        request.RequestUri, null, imageJ2000, newSize, false));
+                        m_textureManager.ReturnData(
+                            state.RequestID,
+                            new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
+                            request.RequestUri, null, imageJ2000, newSize, false));
+                    }
+                    response.Close();
                 }
             }
         }