Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 19 insertions, 7 deletions

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 57931d4..9b1d906 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -223,11 +223,11 @@ namespace OpenSim.Framework.Servers
                 {
                     handlers.AppendFormat(
                         "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port);
-        
+
                     handlers.AppendFormat("* XMLRPC:\n");
                     foreach (String s in httpServer.GetXmlRpcHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* HTTP:\n");
                     foreach (String s in httpServer.GetHTTPHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
@@ -235,19 +235,19 @@ namespace OpenSim.Framework.Servers
                     handlers.AppendFormat("* HTTP (poll):\n");
                     foreach (String s in httpServer.GetPollServiceHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-                    
+
                     handlers.AppendFormat("* JSONRPC:\n");
                     foreach (String s in httpServer.GetJsonRpcHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
 //                    handlers.AppendFormat("* Agent:\n");
 //                    foreach (String s in httpServer.GetAgentHandlerKeys())
 //                        handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* LLSD:\n");
                     foreach (String s in httpServer.GetLLSDHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
-        
+
                     handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count);
                     foreach (String s in httpServer.GetStreamHandlerKeys())
                         handlers.AppendFormat("\t{0}\n", s);
@@ -334,7 +334,7 @@ namespace OpenSim.Framework.Servers
         {
             if (port == 0)
                 return Instance;
-            
+
             if (instance != null && port == Instance.Port)
                 return Instance;
 
@@ -353,5 +353,17 @@ namespace OpenSim.Framework.Servers
                 return m_Servers[port];
             }
         }
+
+        public static void Stop()
+        {
+            lock (m_Servers)
+            {
+                foreach (BaseHttpServer httpServer in m_Servers.Values)
+                {
+                    httpServer.Stop();
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file