aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2012-08-01 23:03:03 +0100
committerMelanie2012-08-01 23:03:03 +0100
commitecffcf7f65151a45b6396354d66fec70a7f3bad8 (patch)
treec2b98c522344cf713421b21ddb4452e537396f5a /OpenSim/Region/Application
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.zip
opensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.gz
opensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.bz2
opensim-SC_OLD-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f378153..aed10f6 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -783,6 +783,7 @@ namespace OpenSim
783 scene.LoadWorldMap(); 783 scene.LoadWorldMap();
784 784
785 scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName); 785 scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName);
786 scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset;
786 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 787 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
787 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); 788 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
788 789