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

author: Diva Canto 2012-11-27 14:43:01 -0800
committer: Diva Canto 2012-11-27 14:43:01 -0800
commit: a82f699f4348ea1ab139ab338973c9cee04df712 (patch)
tree: d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
parent: Prevent the core Groups module from being enabled when its name doesn't match... (diff)
parent: BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff)
download: opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.zip
opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz
opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2
opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 198e487..dd27294 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -38,7 +38,7 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
    [TestFixture]
-    public class UuidGathererTests
+    public class UuidGathererTests : OpenSimTestCase
    {
        protected IAssetService m_assetService;
        protected UuidGatherer m_uuidGatherer;
author	Diva Canto	2012-11-27 14:43:01 -0800
committer	Diva Canto	2012-11-27 14:43:01 -0800
commit	a82f699f4348ea1ab139ab338973c9cee04df712 (patch)
tree	d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
parent	Prevent the core Groups module from being enabled when its name doesn't match... (diff)
parent	BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff)
download	opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.zip opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2 opensim-SC-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index 198e487..dd27294 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -38,7 +38,7 @@ using OpenSim.Tests.Common.Mock;
38	namespace OpenSim.Region.Framework.Scenes.Tests	38	namespace OpenSim.Region.Framework.Scenes.Tests
39	{	39	{
40	[TestFixture]	40	[TestFixture]
41	public class UuidGathererTests	41	public class UuidGathererTests : OpenSimTestCase
42	{	42	{
43	protected IAssetService m_assetService;	43	protected IAssetService m_assetService;
44	protected UuidGatherer m_uuidGatherer;	44	protected UuidGatherer m_uuidGatherer;