2 files changed, 73 insertions, 46 deletions

diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
index 6f68025..a20b5ba 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
@@ -42,7 +69,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
 
         public void AddRegion(Scene scene)
         {
-            lock(m_scenes)
+            lock (m_scenes)
                 m_scenes.Add(scene);
         }
 
@@ -105,7 +132,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
             string user = (string)requestData["user"];
             m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
 
-            lock(m_scenes)
+            lock (m_scenes)
                 foreach (Scene scene in m_scenes)
                 {
                     IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 61c37b9..5b326d4 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             RequestState state = (RequestState) result.AsyncState;
             WebRequest request = (WebRequest) state.Request;
             Stream stream = null;
-                        byte[] imageJ2000 = new byte[0];
+            byte[] imageJ2000 = new byte[0];
 
             try
             {
@@ -174,51 +174,51 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                 if (response != null && response.StatusCode == HttpStatusCode.OK)
                 {
                     stream = response.GetResponseStream();
-                    if(stream != null)
+                    if (stream != null)
                     {
-                                                Bitmap image = new Bitmap(stream);
-                                                Size newsize;
-
-                                                // TODO: make this a bit less hard coded
-                                                if ((image.Height < 64) && (image.Width < 64))
-                                                {
-                                                        newsize = new Size(32, 32);
-                                                }
-                                                else if ((image.Height < 128) && (image.Width < 128))
-                                                {
-                                                        newsize = new Size(64, 64);
-                                                }
-                                                else if ((image.Height < 256) && (image.Width < 256))
-                                                {
-                                                        newsize = new Size(128, 128);
-                                                }
-                                                else if ((image.Height < 512 && image.Width < 512))
-                                                {
-                                                        newsize = new Size(256, 256);
-                                                }
-                                                else if ((image.Height < 1024 && image.Width < 1024))
-                                                {
-                                                        newsize = new Size(512, 512);
-                                                }
-                                                else
-                                                {
-                                                        newsize = new Size(1024, 1024);
-                                                }
-
-                                                Bitmap resize = new Bitmap(image, newsize);
-                                                
-                                                try
-                                                {
-                                                        imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
-                                                } 
-                                                catch (Exception)
-                                                {
-                                                        m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
-                                                }
+                        Bitmap image = new Bitmap(stream);
+                        Size newsize;
+
+                        // TODO: make this a bit less hard coded
+                        if ((image.Height < 64) && (image.Width < 64))
+                        {
+                            newsize = new Size(32, 32);
+                        }
+                        else if ((image.Height < 128) && (image.Width < 128))
+                        {
+                            newsize = new Size(64, 64);
+                        }
+                        else if ((image.Height < 256) && (image.Width < 256))
+                        {
+                            newsize = new Size(128, 128);
+                        }
+                        else if ((image.Height < 512 && image.Width < 512))
+                        {
+                            newsize = new Size(256, 256);
+                        }
+                        else if ((image.Height < 1024 && image.Width < 1024))
+                        {
+                            newsize = new Size(512, 512);
+                        }
+                        else
+                        {
+                            newsize = new Size(1024, 1024);
+                        }
+
+                        Bitmap resize = new Bitmap(image, newsize);
+                        
+                        try
+                        {
+                            imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
+                        } 
+                        catch (Exception)
+                        {
+                            m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
+                        }
                     }
                     else
                     {
-                                                m_log.WarnFormat("[LOADIMAGEURLMODULE] No data returned");
+                        m_log.WarnFormat("[LOADIMAGEURLMODULE] No data returned");
                     }
                 }
             }
@@ -228,7 +228,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             }
             finally
             {
-                if(stream != null)
+                if (stream != null)
                 {
                     stream.Close();
                 }