aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Tests
diff options
context:
space:
mode:
authorAdam Frisby2009-08-18 00:59:05 +1000
committerAdam Frisby2009-08-18 00:59:05 +1000
commit95bb22f88325e9b0a18a968879db8e185091e3d2 (patch)
tree7d23ce138a31a82590ea95e22bfd768267b9e0e6 /OpenSim/Framework/Tests
parentAdded additional configuration options for MRM Security. See OpenSim.ini.exam... (diff)
parent* More Test tweaking to get down to the root cause of the test wierdness (diff)
downloadopensim-SC_OLD-95bb22f88325e9b0a18a968879db8e185091e3d2.zip
opensim-SC_OLD-95bb22f88325e9b0a18a968879db8e185091e3d2.tar.gz
opensim-SC_OLD-95bb22f88325e9b0a18a968879db8e185091e3d2.tar.bz2
opensim-SC_OLD-95bb22f88325e9b0a18a968879db8e185091e3d2.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Tests')
-rw-r--r--OpenSim/Framework/Tests/AgentCircuitDataTest.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index 12b9cc1..ecd35c0 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -325,6 +325,8 @@ namespace OpenSim.Framework.Tests
325 { 325 {
326 //spurious litjson errors :P 326 //spurious litjson errors :P
327 map2 = map; 327 map2 = map;
328 Assert.That(1==1);
329 return;
328 } 330 }
329 331
330 AgentCircuitData Agent2Data = new AgentCircuitData(); 332 AgentCircuitData Agent2Data = new AgentCircuitData();