diff options
author | Teravus Ovares | 2007-11-10 19:13:52 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-10 19:13:52 +0000 |
commit | cb07ba0d68eeb57bae1cb60f387483ff720cc29d (patch) | |
tree | a46f7b6b50e70a9f5f56a89396ba8a3f1078c19e /OpenSim/Region/ClientStack | |
parent | * ODE Fixed annoying bug where resizing causes there to be a 'ghost' prim lef... (diff) | |
download | opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.zip opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.tar.gz opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.tar.bz2 opensim-SC-cb07ba0d68eeb57bae1cb60f387483ff720cc29d.tar.xz |
* Moves the Meshmerizer to a separate plugin
* Experimental. Linux Prebuild needs testing.
* One more update after this to remove the ODEMeshing directory....
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 7 |
1 files changed, 4 insertions, 3 deletions
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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using Nini.Config; | ||
32 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications; | 34 | using OpenSim.Framework.Communications; |
34 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
@@ -89,12 +90,12 @@ namespace OpenSim.Region.ClientStack | |||
89 | protected abstract PhysicsScene GetPhysicsScene(); | 90 | protected abstract PhysicsScene GetPhysicsScene(); |
90 | protected abstract StorageManager CreateStorageManager(RegionInfo regionInfo); | 91 | protected abstract StorageManager CreateStorageManager(RegionInfo regionInfo); |
91 | 92 | ||
92 | protected PhysicsScene GetPhysicsScene(string engine) | 93 | protected PhysicsScene GetPhysicsScene(string engine, string meshEngine) |
93 | { | 94 | { |
94 | PhysicsPluginManager physicsPluginManager; | 95 | PhysicsPluginManager physicsPluginManager; |
95 | physicsPluginManager = new PhysicsPluginManager(); | 96 | physicsPluginManager = new PhysicsPluginManager(); |
96 | physicsPluginManager.LoadPlugins(); | 97 | physicsPluginManager.LoadPlugins(); |
97 | return physicsPluginManager.GetPhysicsScene(engine); | 98 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine); |
98 | } | 99 | } |
99 | 100 | ||
100 | protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer) | 101 | protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer) |
@@ -150,4 +151,4 @@ namespace OpenSim.Region.ClientStack | |||
150 | protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 151 | protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
151 | AgentCircuitManager circuitManager); | 152 | AgentCircuitManager circuitManager); |
152 | } | 153 | } |
153 | } \ No newline at end of file | 154 | } |