diff options
author | UbitUmarov | 2015-08-19 11:04:28 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-19 11:04:28 +0100 |
commit | 0af2fafddf36009ffe470da106dc6d0ceb3ced10 (patch) | |
tree | c5d2a58398fcc4bd1b4722a8379ce9bb643fe8e5 /OpenSim/Region/ClientStack | |
parent | Merge branch 'mbworkvar2' into ubitvar (diff) | |
download | opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.zip opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.gz opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.bz2 opensim-SC_OLD-0af2fafddf36009ffe470da106dc6d0ceb3ced10.tar.xz |
add missing regionExtent setup and Scene physicsscene configuration ( not
exactly as core)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 287c278..982646e 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ClientStack | |||
69 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. | 69 | /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages. |
70 | /// </param> | 70 | /// </param> |
71 | /// <returns></returns> | 71 | /// <returns></returns> |
72 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier); | 72 | protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent); |
73 | 73 | ||
74 | protected abstract ClientStackManager CreateClientStackManager(); | 74 | protected abstract ClientStackManager CreateClientStackManager(); |
75 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); | 75 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); |
@@ -135,13 +135,13 @@ namespace OpenSim.Region.ClientStack | |||
135 | /// </param> | 135 | /// </param> |
136 | /// <returns></returns> | 136 | /// <returns></returns> |
137 | protected PhysicsScene GetPhysicsScene( | 137 | protected PhysicsScene GetPhysicsScene( |
138 | string engine, string meshEngine, IConfigSource config, string osSceneIdentifier) | 138 | string engine, string meshEngine, IConfigSource config, string osSceneIdentifier, Vector3 regionExtent) |
139 | { | 139 | { |
140 | PhysicsPluginManager physicsPluginManager; | 140 | PhysicsPluginManager physicsPluginManager; |
141 | physicsPluginManager = new PhysicsPluginManager(); | 141 | physicsPluginManager = new PhysicsPluginManager(); |
142 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); | 142 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); |
143 | 143 | ||
144 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier); | 144 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); |
145 | } | 145 | } |
146 | } | 146 | } |
147 | } | 147 | } |