diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index ef8ea50..91cf323 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -32,7 +32,6 @@ using Nini.Config; | |||
| 32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
| 33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
| 34 | using OpenSim.Framework.Communications; | 34 | using OpenSim.Framework.Communications; |
| 35 | |||
| 36 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
| 37 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
| 38 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
| @@ -115,7 +114,6 @@ namespace OpenSim.Tests.Common.Setup | |||
| 115 | return SetupScene(name, id, x, y,""); | 114 | return SetupScene(name, id, x, y,""); |
| 116 | } | 115 | } |
| 117 | 116 | ||
| 118 | |||
| 119 | /// <summary> | 117 | /// <summary> |
| 120 | /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions | 118 | /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions |
| 121 | /// or a different, to get a brand new scene with new shared region modules. | 119 | /// or a different, to get a brand new scene with new shared region modules. |