aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
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/Environment
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 '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4188deb..5b93ef9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -43,6 +43,7 @@ using OpenSim.Region.Environment.Interfaces;
43using OpenSim.Region.Environment.Modules.World.Terrain; 43using OpenSim.Region.Environment.Modules.World.Terrain;
44using OpenSim.Region.Environment.Scenes.Scripting; 44using OpenSim.Region.Environment.Scenes.Scripting;
45using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
46using Nini.Config;
46using Caps=OpenSim.Framework.Communications.Capabilities.Caps; 47using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
47using Image=System.Drawing.Image; 48using Image=System.Drawing.Image;
48using Timer=System.Timers.Timer; 49using Timer=System.Timers.Timer;
@@ -115,6 +116,7 @@ namespace OpenSim.Region.Environment.Scenes
115 protected IWorldComm m_worldCommModule; 116 protected IWorldComm m_worldCommModule;
116 protected IAvatarFactory m_AvatarFactory; 117 protected IAvatarFactory m_AvatarFactory;
117 protected IScenePermissions m_permissions; 118 protected IScenePermissions m_permissions;
119 protected IConfigSource m_config;
118 120
119 // Central Update Loop 121 // Central Update Loop
120 122
@@ -134,6 +136,7 @@ namespace OpenSim.Region.Environment.Scenes
134 private int m_update_backup = 200; 136 private int m_update_backup = 200;
135 private int m_update_terrain = 50; 137 private int m_update_terrain = 50;
136 private int m_update_land = 1; 138 private int m_update_land = 1;
139
137 140
138 private int frameMS = 0; 141 private int frameMS = 0;
139 private int physicsMS2 = 0; 142 private int physicsMS2 = 0;
@@ -223,8 +226,9 @@ namespace OpenSim.Region.Environment.Scenes
223 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 226 public Scene(RegionInfo regInfo, AgentCircuitManager authen,
224 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 227 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
225 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 228 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
226 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor) 229 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config)
227 { 230 {
231 m_config = config;
228 updateLock = new Mutex(false); 232 updateLock = new Mutex(false);
229 m_moduleLoader = moduleLoader; 233 m_moduleLoader = moduleLoader;
230 m_authenticateHandler = authen; 234 m_authenticateHandler = authen;