From 2a988f187ec4c743d6b269fc3a8fe32d84716f65 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 14 May 2008 23:15:25 +0000 Subject: * 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. --- OpenSim/Region/Environment/Scenes/Scene.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs') 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; using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes.Scripting; using OpenSim.Region.Physics.Manager; +using Nini.Config; using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Image=System.Drawing.Image; using Timer=System.Timers.Timer; @@ -115,6 +116,7 @@ namespace OpenSim.Region.Environment.Scenes protected IWorldComm m_worldCommModule; protected IAvatarFactory m_AvatarFactory; protected IScenePermissions m_permissions; + protected IConfigSource m_config; // Central Update Loop @@ -134,6 +136,7 @@ namespace OpenSim.Region.Environment.Scenes private int m_update_backup = 200; private int m_update_terrain = 50; private int m_update_land = 1; + private int frameMS = 0; private int physicsMS2 = 0; @@ -223,8 +226,9 @@ namespace OpenSim.Region.Environment.Scenes public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, - ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor) + ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config) { + m_config = config; updateLock = new Mutex(false); m_moduleLoader = moduleLoader; m_authenticateHandler = authen; -- cgit v1.1