diff options
author | Melanie | 2012-08-01 22:36:24 +0100 |
---|---|---|
committer | Melanie | 2012-08-01 22:37:38 +0100 |
commit | cf16ca9bdaad75d42213089e18c0ee8f8422bbd6 (patch) | |
tree | 95535b154bbb2eda07d217d2c3ac82f8a08cecb8 /OpenSim/Region/Application | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.zip opensim-SC-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.tar.gz opensim-SC-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.tar.bz2 opensim-SC-cf16ca9bdaad75d42213089e18c0ee8f8422bbd6.tar.xz |
Create the ability for physics modules to request assets on demand by
themselves. For that, the physics module simply calls RequestAssetMethod, which
in turn points to Scene.PhysicsRequestAsset. This gives physics access to
the asset system without introducing unwanted knowledge of the scene class.
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 | ||