aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 23:15:25 +0000
committerTeravus Ovares2008-05-14 23:15:25 +0000
commit2a988f187ec4c743d6b269fc3a8fe32d84716f65 (patch)
tree728d7e4ef601ed0630b0a7f156c63512966603c0 /OpenSim/Region/ClientStack
parent* Start recording as a statistic the number of times we start blocking repeti... (diff)
downloadopensim-SC-2a988f187ec4c743d6b269fc3a8fe32d84716f65.zip
opensim-SC-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.gz
opensim-SC-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.bz2
opensim-SC-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.xz
* Refactored IConfigSource into Physics plug-ins and Scene. We can get rid of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on
* The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 5e0e074..b16f74b 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -30,6 +30,7 @@ using System.Net;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net; 32using log4net;
33using Nini.Config;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
@@ -99,12 +100,12 @@ namespace OpenSim.Region.ClientStack
99 protected abstract PhysicsScene GetPhysicsScene(); 100 protected abstract PhysicsScene GetPhysicsScene();
100 protected abstract StorageManager CreateStorageManager(string connectionstring); 101 protected abstract StorageManager CreateStorageManager(string connectionstring);
101 102
102 protected PhysicsScene GetPhysicsScene(string engine, string meshEngine) 103 protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config)
103 { 104 {
104 PhysicsPluginManager physicsPluginManager; 105 PhysicsPluginManager physicsPluginManager;
105 physicsPluginManager = new PhysicsPluginManager(); 106 physicsPluginManager = new PhysicsPluginManager();
106 physicsPluginManager.LoadPlugins(); 107 physicsPluginManager.LoadPlugins();
107 return physicsPluginManager.GetPhysicsScene(engine, meshEngine); 108 return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config);
108 } 109 }
109 110
110 protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer) 111 protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer)