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/Capabilities | |
| parent | Merge branch 'careminster' into avination (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs index b6ae41b..217a265 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs | |||
| @@ -43,7 +43,7 @@ using OpenSim.Tests.Common.Mock; | |||
| 43 | namespace OpenSim.Capabilities.Handlers.GetTexture.Tests | 43 | namespace OpenSim.Capabilities.Handlers.GetTexture.Tests |
| 44 | { | 44 | { |
| 45 | [TestFixture] | 45 | [TestFixture] |
| 46 | public class GetTextureHandlerTests | 46 | public class GetTextureHandlerTests : OpenSimTestCase |
| 47 | { | 47 | { |
| 48 | [Test] | 48 | [Test] |
| 49 | public void TestTextureNotFound() | 49 | public void TestTextureNotFound() |