aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-26 19:22:30 +0100
committerJustin Clark-Casey (justincc)2013-07-26 19:22:30 +0100
commit056a6ee7653b17d8c1d92519f34f029bcd602143 (patch)
treeac59eb147365925e4fb4f3d37e9a77aa1f2a8976 /OpenSim/Framework
parentFix NPC regression test failures. (diff)
downloadopensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.zip
opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.gz
opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.bz2
opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.xz
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/MainServer.cs5
1 files changed, 5 insertions, 0 deletions
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
285 public static bool RemoveHttpServer(uint port) 285 public static bool RemoveHttpServer(uint port)
286 { 286 {
287 lock (m_Servers) 287 lock (m_Servers)
288 {
289 if (instance != null && instance.Port == port)
290 instance = null;
291
288 return m_Servers.Remove(port); 292 return m_Servers.Remove(port);
293 }
289 } 294 }
290 295
291 /// <summary> 296 /// <summary>