From 056a6ee7653b17d8c1d92519f34f029bcd602143 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 19:22:30 +0100
Subject: Fix regression tests relating to agent transfer by making simulator
 use last week's SIMULATOR/0.1 protocol for now.

---
 OpenSim/Framework/Servers/MainServer.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Framework/Servers/MainServer.cs')

diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index d189580..57931d4 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -285,7 +285,12 @@ namespace OpenSim.Framework.Servers
         public static bool RemoveHttpServer(uint port)
         {
             lock (m_Servers)
+            {
+                if (instance != null && instance.Port == port)
+                    instance = null;
+
                 return m_Servers.Remove(port);
+            }
         }
 
         /// <summary>
-- 
cgit v1.1