aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
diff options
context:
space:
mode:
authorMelanie2011-05-22 20:00:59 +0200
committerMelanie2011-05-22 20:00:59 +0200
commit89705b19c7a921f3a1432203694f76a3c3711775 (patch)
tree0da8e5adfbb408042a6658b8315c9337f8affd3a /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
parentAdd a missing virtual keyword (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-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.cs1
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;
44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; 44using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
45using OpenSim.Tests.Common; 45using OpenSim.Tests.Common;
46using OpenSim.Tests.Common.Mock; 46using OpenSim.Tests.Common.Mock;
47using OpenSim.Tests.Common.Setup;
48 47
49namespace OpenSim.Region.Framework.Scenes.Tests 48namespace OpenSim.Region.Framework.Scenes.Tests
50{ 49{