merge master

2026-08-13 05:05:43 +08:00 · 2017-05-23 07:35:02 +01:00
parent 0320225ca8 07e614a32c
commit c0bfaac0ac
23 changed files with 147 additions and 111 deletions
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -369,5 +369,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();
+                }
+            }
+        }
+
    }
 }