mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +08:00
* Moves the Meshmerizer to a separate plugin
* Experimental. Linux Prebuild needs testing. * One more update after this to remove the ODEMeshing directory....
This commit is contained in:
@@ -29,6 +29,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using libsecondlife;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
@@ -89,12 +90,12 @@ namespace OpenSim.Region.ClientStack
|
||||
protected abstract PhysicsScene GetPhysicsScene();
|
||||
protected abstract StorageManager CreateStorageManager(RegionInfo regionInfo);
|
||||
|
||||
protected PhysicsScene GetPhysicsScene(string engine)
|
||||
protected PhysicsScene GetPhysicsScene(string engine, string meshEngine)
|
||||
{
|
||||
PhysicsPluginManager physicsPluginManager;
|
||||
physicsPluginManager = new PhysicsPluginManager();
|
||||
physicsPluginManager.LoadPlugins();
|
||||
return physicsPluginManager.GetPhysicsScene(engine);
|
||||
return physicsPluginManager.GetPhysicsScene(engine, meshEngine);
|
||||
}
|
||||
|
||||
protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer)
|
||||
@@ -150,4 +151,4 @@ namespace OpenSim.Region.ClientStack
|
||||
protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
|
||||
AgentCircuitManager circuitManager);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user