diff options
| author | Justin Clark-Casey (justincc) | 2011-10-15 02:54:43 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-15 02:54:43 +0100 |
| commit | 528cc8136e567b5bac583728fbb0235baaba2f02 (patch) | |
| tree | f550fb1ff8b6a7845026e1cf6e650a6ff505e54e /OpenSim/Tests | |
| parent | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() (diff) | |
| download | opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.zip opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.tar.gz opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.tar.bz2 opensim-SC_OLD-528cc8136e567b5bac583728fbb0235baaba2f02.tar.xz | |
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index ea433a6..c64270f 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -108,7 +108,7 @@ namespace OpenSim.Tests.Common | |||
| 108 | IConfigSource configSource = new IniConfigSource(); | 108 | IConfigSource configSource = new IniConfigSource(); |
| 109 | 109 | ||
| 110 | TestScene testScene = new TestScene( | 110 | TestScene testScene = new TestScene( |
| 111 | regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null); | 111 | regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null); |
| 112 | 112 | ||
| 113 | IRegionModule godsModule = new GodsModule(); | 113 | IRegionModule godsModule = new GodsModule(); |
| 114 | godsModule.Initialise(testScene, new IniConfigSource()); | 114 | godsModule.Initialise(testScene, new IniConfigSource()); |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 0e1433a..f0e65c5 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
| @@ -41,10 +41,10 @@ namespace OpenSim.Tests.Common.Mock | |||
| 41 | public TestScene( | 41 | public TestScene( |
| 42 | RegionInfo regInfo, AgentCircuitManager authen, | 42 | RegionInfo regInfo, AgentCircuitManager authen, |
| 43 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, | 43 | SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, |
| 44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 44 | ModuleLoader moduleLoader, bool dumpAssetsToFile, |
| 45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 45 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
| 46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, | 46 | : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, |
| 47 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 47 | dumpAssetsToFile, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
| 48 | { | 48 | { |
| 49 | } | 49 | } |
| 50 | 50 | ||