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/SceneObjectLinkingTests.cs | |
| parent | Add a missing virtual keyword (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.zip opensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.tar.gz opensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.tar.bz2 opensim-SC_OLD-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/SceneObjectLinkingTests.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index bdfcd1d..cb1d531 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
| @@ -35,7 +35,6 @@ using OpenSim.Framework.Communications; | |||
| 35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
| 36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
| 37 | using OpenSim.Tests.Common.Mock; | 37 | using OpenSim.Tests.Common.Mock; |
| 38 | using OpenSim.Tests.Common.Setup; | ||
| 39 | using log4net; | 38 | using log4net; |
| 40 | 39 | ||
| 41 | namespace OpenSim.Region.Framework.Scenes.Tests | 40 | namespace OpenSim.Region.Framework.Scenes.Tests |