aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/SceneHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs13
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 9ed3eae..b368822 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -152,22 +152,13 @@ namespace OpenSim.Tests.Common
152 152
153 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 153 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
154 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); 154 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
155<<<<<<< HEAD
156 Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
157 PhysicsScene physicsScene
158=======
159 Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); 155 Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
160 PhysicsScene physicsScene 156 PhysicsScene physicsScene
161>>>>>>> avn/ubitvar
162 = physicsPluginManager.GetPhysicsScene( 157 = physicsPluginManager.GetPhysicsScene(
163 "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); 158 "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
164 159
165 TestScene testScene = new TestScene( 160 TestScene testScene = new TestScene(
166<<<<<<< HEAD
167 regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null); 161 regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null);
168=======
169 regInfo, m_acm, physicsScene, scs, m_simDataService, m_estateDataService, configSource, null);
170>>>>>>> avn/ubitvar
171 162
172 INonSharedRegionModule godsModule = new GodsModule(); 163 INonSharedRegionModule godsModule = new GodsModule();
173 godsModule.Initialise(new IniConfigSource()); 164 godsModule.Initialise(new IniConfigSource());
@@ -210,11 +201,7 @@ namespace OpenSim.Tests.Common
210 testScene.SetModuleInterfaces(); 201 testScene.SetModuleInterfaces();
211 202
212 testScene.LandChannel = new TestLandChannel(testScene); 203 testScene.LandChannel = new TestLandChannel(testScene);
213<<<<<<< HEAD
214 testScene.LoadWorldMap();
215=======
216 testScene.LoadWorldMap(); 204 testScene.LoadWorldMap();
217>>>>>>> avn/ubitvar
218 205
219 testScene.RegionInfo.EstateSettings = new EstateSettings(); 206 testScene.RegionInfo.EstateSettings = new EstateSettings();
220 testScene.LoginsEnabled = true; 207 testScene.LoginsEnabled = true;