diff options
| author | Justin Clark-Casey (justincc) | 2012-08-02 23:54:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-02 23:54:32 +0100 |
| commit | 0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81 (patch) | |
| tree | 88d593f56cbaca2c2ba796d87d91f3b5c17c22de /OpenSim/Region/Application | |
| parent | Add simple draw test for the VectorRenderModule (diff) | |
| parent | Initialize the Rezzing object to UUID.Zero (diff) | |
| download | opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.zip opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.gz opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.bz2 opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 4084741..37cfe1d 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -700,6 +700,7 @@ namespace OpenSim | |||
| 700 | scene.LoadWorldMap(); | 700 | scene.LoadWorldMap(); |
| 701 | 701 | ||
| 702 | scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName); | 702 | scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName); |
| 703 | scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset; | ||
| 703 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); | 704 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); |
| 704 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); | 705 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); |
| 705 | 706 | ||