diff options
author | Melanie | 2011-05-22 20:00:59 +0200 |
---|---|---|
committer | Melanie | 2011-05-22 20:00:59 +0200 |
commit | 89705b19c7a921f3a1432203694f76a3c3711775 (patch) | |
tree | 0da8e5adfbb408042a6658b8315c9337f8affd3a /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |
parent | Add a missing virtual keyword (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-89705b19c7a921f3a1432203694f76a3c3711775.zip opensim-SC-89705b19c7a921f3a1432203694f76a3c3711775.tar.gz opensim-SC-89705b19c7a921f3a1432203694f76a3c3711775.tar.bz2 opensim-SC-89705b19c7a921f3a1432203694f76a3c3711775.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index efb757f..03ac252 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -44,7 +44,6 @@ using OpenSim.Region.CoreModules.World.Serialiser; | |||
44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
45 | using OpenSim.Tests.Common; | 45 | using OpenSim.Tests.Common; |
46 | using OpenSim.Tests.Common.Mock; | 46 | using OpenSim.Tests.Common.Mock; |
47 | using OpenSim.Tests.Common.Setup; | ||
48 | 47 | ||
49 | namespace OpenSim.Region.Framework.Scenes.Tests | 48 | namespace OpenSim.Region.Framework.Scenes.Tests |
50 | { | 49 | { |