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/ServiceConnectorsOut | |
| 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 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs index 32e47f9..7e365ca 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs | |||
| @@ -35,7 +35,6 @@ using NUnit.Framework; | |||
| 35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using Nini.Config; | 37 | using Nini.Config; |
| 38 | |||
| 39 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence; | 38 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence; |
| 40 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
| 41 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; | 40 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; |
| @@ -44,7 +43,7 @@ using OpenSim.Tests.Common; | |||
| 44 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests | 43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests |
| 45 | { | 44 | { |
| 46 | [TestFixture] | 45 | [TestFixture] |
| 47 | public class PresenceConnectorsTests | 46 | public class PresenceConnectorsTests : OpenSimTestCase |
| 48 | { | 47 | { |
| 49 | LocalPresenceServicesConnector m_LocalConnector; | 48 | LocalPresenceServicesConnector m_LocalConnector; |
| 50 | private void SetUp() | 49 | private void SetUp() |