diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 148e03faa6..5fd36195d2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -179,13 +179,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
-        ///
+        /// Close a client circuit only
         /// </summary>
         /// <param name="circuitcode"></param>
         public virtual void CloseCircuit(uint circuitcode)
         {
             m_networkHandler.RemoveClientCircuit(circuitcode);
 
+            // XXX: Why is this commented out?  Possibly because close mechanisms are so tangled right now
             //m_scene.ClientManager.CloseAllAgents(circuitcode);
         }
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index dc1c63d444..a40677eb13 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -283,6 +283,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             testLLUDPServer.LoadReceiveWithBeginException(epA);
             testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB);
             testLLUDPServer.ReceiveData(null);
+            
+            Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
          
             Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));  
             Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));