diff options
| author | Melanie | 2012-11-25 14:13:50 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-25 14:13:50 +0000 |
| commit | fd7a83f439132062d500471830eb26e7183d30bc (patch) | |
| tree | db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'careminster' into avination (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index 21d8bd7..b768257 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | |||
| @@ -49,7 +49,7 @@ using OpenSim.Tests.Common.Mock; | |||
| 49 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | 49 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests |
| 50 | { | 50 | { |
| 51 | [TestFixture] | 51 | [TestFixture] |
| 52 | public class InventoryAccessModuleTests | 52 | public class InventoryAccessModuleTests : OpenSimTestCase |
| 53 | { | 53 | { |
| 54 | protected TestScene m_scene; | 54 | protected TestScene m_scene; |
| 55 | protected BasicInventoryAccessModule m_iam; | 55 | protected BasicInventoryAccessModule m_iam; |