diff options
| author | Melanie | 2011-05-05 09:49:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-05 09:49:10 +0100 |
| commit | 4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c (patch) | |
| tree | 24e24cb7b424df74b13788d28be9d7588fbd99d0 /OpenSim/Tests | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Test m_Enabled on RemoveRegion. (diff) | |
| download | opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.zip opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.gz opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.bz2 opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 99517d2..d122409 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -39,7 +39,6 @@ using OpenSim.Region.Physics.Manager; | |||
| 39 | using OpenSim.Region.Framework; | 39 | using OpenSim.Region.Framework; |
| 40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
| 41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
| 42 | using OpenSim.Region.CoreModules.Agent.Capabilities; | ||
| 43 | using OpenSim.Region.CoreModules.Avatar.Gods; | 42 | using OpenSim.Region.CoreModules.Avatar.Gods; |
| 44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; | 43 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; |
| 45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication; | 44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication; |