Merge branch 'master' into bulletsim

Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
author: Mic Bowman 2011-08-19 14:49:16 -0700
committer: Mic Bowman 2011-08-19 14:49:16 -0700
commit: 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch)
tree: 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Tests/Common/TestHelpers.cs
parent: BulletSim: add runtime setting of physics parameters. Update default values. (diff)
parent: Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff)
download: opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2
opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelpers.cs
index 86bd107..ced06de 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -32,7 +32,7 @@ using OpenMetaverse;
 namespace OpenSim.Tests.Common
 {
-    public class TestHelper
+    public class TestHelpers
    {
        public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)
        {
author	Mic Bowman	2011-08-19 14:49:16 -0700
committer	Mic Bowman	2011-08-19 14:49:16 -0700
commit	384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch)
tree	5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Tests/Common/TestHelpers.cs
parent	BulletSim: add runtime setting of physics parameters. Update default values. (diff)
parent	Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff)
download	opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC_OLD-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz

diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelpers.cs index 86bd107..ced06de 100644 --- a/OpenSim/Tests/Common/TestHelper.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -32,7 +32,7 @@ using OpenMetaverse;
32		32
33	namespace OpenSim.Tests.Common	33	namespace OpenSim.Tests.Common
34	{	34	{
35	public class TestHelper	35	public class TestHelpers
36	{	36	{
37	public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)	37	public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)
38	{	38	{