OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more on compile..

avinationmerge
UbitUmarov 2015-09-08 18:45:53 +01:00
parent ecc1969857
commit 339f60e990
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -267,11 +267,11 @@ namespace OpenSim
base.StartupSpecific(); base.StartupSpecific();
if (EnableInitialPluginLoad)
LoadPlugins();
// We still want to post initalize any plugins even if loading has been disabled since a test may have // We still want to post initalize any plugins even if loading has been disabled since a test may have
// inserted them manually. // inserted them manually.
LoadPlugins();
foreach (IApplicationPlugin plugin in m_plugins) foreach (IApplicationPlugin plugin in m_plugins)
plugin.PostInitialise(); plugin.PostInitialise();
@ -293,10 +293,10 @@ namespace OpenSim
"help " + capitalizedTopic, "help " + capitalizedTopic,
"Get help on plugin command '" + topic + "'", "Get help on plugin command '" + topic + "'",
HandleCommanderHelp); HandleCommanderHelp);
// console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic, console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
// "help " + capitalizedTopic, "help " + capitalizedTopic,
// "Get help on plugin command '" + topic + "'", "Get help on plugin command '" + topic + "'",
// HandleCommanderHelp); HandleCommanderHelp);
ICommander commander = null; ICommander commander = null;
@ -773,10 +773,6 @@ namespace OpenSim
protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
IEstateDataService estateDataService, AgentCircuitManager circuitManager) IEstateDataService estateDataService, AgentCircuitManager circuitManager)
{ {
Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
SceneCommunicationService sceneGridService = new SceneCommunicationService();
return new Scene( return new Scene(
regionInfo, circuitManager, regionInfo, circuitManager,
simDataService, estateDataService, simDataService, estateDataService,

3
OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
View File

@ -170,6 +170,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde
public class ODEScene : PhysicsScene, INonSharedRegionModule public class ODEScene : PhysicsScene, INonSharedRegionModule
{ {
private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString()); private readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString());
public string LogHeader = "[UbitODE]";
private bool m_Enabled = false; private bool m_Enabled = false;
// private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
@ -574,7 +575,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde
d.WorldSetContactSurfaceLayer(world, contactsurfacelayer); d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
d.WorldSetContactMaxCorrectingVel(world, 60.0f); d.WorldSetContactMaxCorrectingVel(world, 60.0f);
m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, physicsconfig); m_meshWorker = new ODEMeshWorker(this, m_log, mesher, physicsconfig);
HalfOdeStep = ODE_STEPSIZE * 0.5f; HalfOdeStep = ODE_STEPSIZE * 0.5f;
odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f); odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);

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

@ -153,15 +153,6 @@ namespace OpenSim.Tests.Common
regInfo.RegionSizeX = sizeX; regInfo.RegionSizeX = sizeX;
regInfo.RegionSizeY = sizeY; regInfo.RegionSizeY = sizeY;
SceneCommunicationService scs = new SceneCommunicationService();
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
Vector3 regionExtent = new Vector3(regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
PhysicsScene physicsScene
= physicsPluginManager.GetPhysicsScene(
"basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
TestScene testScene = new TestScene( TestScene testScene = new TestScene(
regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); regInfo, m_acm, SimDataService, m_estateDataService, configSource, null);