From cb07ba0d68eeb57bae1cb60f387483ff720cc29d Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 10 Nov 2007 19:13:52 +0000 Subject: * Moves the Meshmerizer to a separate plugin * Experimental. Linux Prebuild needs testing. * One more update after this to remove the ODEMeshing directory.... --- OpenSim/Region/ClientStack/RegionApplicationBase.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/ClientStack') diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 6071dcd..b0e6419 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -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); } -} \ No newline at end of file +} -- cgit v1.1