removed obsolete Verbose() function

2 files changed, 40 insertions, 18 deletions

diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index adbc625..0e66330 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -1,4 +1,32 @@
-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 OpenSim 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.Generic;
 using System.Text;
 using Mono.Addins;
@@ -14,4 +42,3 @@ namespace OpenSim
         void Close();
     }
 }
-
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d6dc3ea..64fe8df 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -449,7 +449,7 @@ namespace OpenSim
 
         public void handleRestartRegion(RegionInfo whichRegion) 
         {
-            MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager");
+            MainLog.Instance.Error("MAIN", "Got restart signal from SceneManager");
             // Shutting down the UDP server
             bool foundUDPServer = false;
             int UDPServerElement = 0;
@@ -543,7 +543,7 @@ namespace OpenSim
             m_log.Verbose("SHUTDOWN", "Closing all threads");
             m_log.Verbose("SHUTDOWN", "Killing listener thread");
             m_log.Verbose("SHUTDOWN", "Killing clients");
-            // IMPLEMENT THIS
+            // TODO: implement this
             m_log.Verbose("SHUTDOWN", "Closing console and terminating");
 
             m_sceneManager.Close();
@@ -789,10 +789,7 @@ namespace OpenSim
                     {
                         string regionName = CombineParams(cmdparams, 0);
 
-                        if (m_sceneManager.TrySetCurrentScene(regionName))
-                        {
-                        }
-                        else
+                        if (!m_sceneManager.TrySetCurrentScene(regionName))
                         {
                             MainLog.Instance.Error("Couldn't set current region to: " + regionName);
                         }
@@ -812,16 +809,14 @@ namespace OpenSim
                     break;
 
                 case "export-map":
-                   
-                        if (cmdparams.Length > 0)
-                        {
-                            m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
-                        }
-                        else
-                        {
-                            m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
-                        }
-                   
+                    if (cmdparams.Length > 0)
+                    {
+                        m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
+                    }
+                    else
+                    {
+                        m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
+                    }
                     break;
 
                 default: