ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@@ -152,22 +152,13 @@ namespace OpenSim.Tests.Common
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
<<<<<<< HEAD
Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
PhysicsScene physicsScene
=======
Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
PhysicsScene physicsScene
>>>>>>> avn/ubitvar
= physicsPluginManager.GetPhysicsScene(
"basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
TestScene testScene = new TestScene(
<<<<<<< HEAD
regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null);
=======
regInfo, m_acm, physicsScene, scs, m_simDataService, m_estateDataService, configSource, null);
>>>>>>> avn/ubitvar
INonSharedRegionModule godsModule = new GodsModule();
godsModule.Initialise(new IniConfigSource());
@@ -210,11 +201,7 @@ namespace OpenSim.Tests.Common
testScene.SetModuleInterfaces();
testScene.LandChannel = new TestLandChannel(testScene);
<<<<<<< HEAD
testScene.LoadWorldMap();
=======
testScene.LoadWorldMap();
>>>>>>> avn/ubitvar
testScene.RegionInfo.EstateSettings = new EstateSettings();
testScene.LoginsEnabled = true;

3
OpenSim/Tests/Common/Mock/TestScene.cs
View File

@@ -34,10 +34,7 @@ using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Physics.Manager;
<<<<<<< HEAD
using OpenSim.Services.Interfaces;
=======
>>>>>>> avn/ubitvar
namespace OpenSim.Tests.Common
{