aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers
diff options
context:
space:
mode:
authorDiva Canto2015-08-30 15:52:26 -0700
committerDiva Canto2015-08-30 15:52:26 -0700
commit5648eb7bd1f2345aad1530d90964278fe352faea (patch)
tree5a1a83404deb6aea7bb4780beb9a65aeb679ae2a /OpenSim/Tests/Common/Helpers
parentMantis #7713: fixed bug introduced by 1st MOSES patch. (diff)
downloadopensim-SC-5648eb7bd1f2345aad1530d90964278fe352faea.zip
opensim-SC-5648eb7bd1f2345aad1530d90964278fe352faea.tar.gz
opensim-SC-5648eb7bd1f2345aad1530d90964278fe352faea.tar.bz2
opensim-SC-5648eb7bd1f2345aad1530d90964278fe352faea.tar.xz
Moved instantiation of SceneCommunicationService object to inside the scene constructor. This was a left over from the original monolithic design of scene communications. The less the instantiators of scenes know about the scene's internals, the better.
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 1fb1c5c..4f685b6 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Tests.Common
148 regInfo.RegionSizeX = sizeX; 148 regInfo.RegionSizeX = sizeX;
149 regInfo.RegionSizeY = sizeY; 149 regInfo.RegionSizeY = sizeY;
150 150
151 SceneCommunicationService scs = new SceneCommunicationService();
152
153 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 151 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
154 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); 152 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
155 Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); 153 Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
@@ -158,7 +156,7 @@ namespace OpenSim.Tests.Common
158 "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); 156 "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
159 157
160 TestScene testScene = new TestScene( 158 TestScene testScene = new TestScene(
161 regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); 159 regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null);
162 160
163 INonSharedRegionModule godsModule = new GodsModule(); 161 INonSharedRegionModule godsModule = new GodsModule();
164 godsModule.Initialise(new IniConfigSource()); 162 godsModule.Initialise(new IniConfigSource());