Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Framework/Tests/AgentCircuitDataTest.cs

@@ -325,6 +325,8 @@ namespace OpenSim.Framework.Tests
             {
                 //spurious litjson errors :P
                 map2 = map;
+                Assert.That(1==1);
+                return;
             }
 
            AgentCircuitData Agent2Data = new AgentCircuitData();