diff options
| author | unknown | 2009-12-07 18:03:53 +0100 |
|---|---|---|
| committer | unknown | 2009-12-07 18:05:40 +0100 |
| commit | 29a740ec8c78bfc3c1ab5b41b302ae2205c6e9aa (patch) | |
| tree | fa63a89c92a1d0140c31c867aac27f74083d481c /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Enforce physical prim max size on single prims. (diff) | |
| download | opensim-SC-29a740ec8c78bfc3c1ab5b41b302ae2205c6e9aa.zip opensim-SC-29a740ec8c78bfc3c1ab5b41b302ae2205c6e9aa.tar.gz opensim-SC-29a740ec8c78bfc3c1ab5b41b302ae2205c6e9aa.tar.bz2 opensim-SC-29a740ec8c78bfc3c1ab5b41b302ae2205c6e9aa.tar.xz | |
Initial windlight codebase commit
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f5a1e74..f70af27 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -539,6 +539,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 539 | 539 | ||
| 540 | // Load region settings | 540 | // Load region settings |
| 541 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); | 541 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); |
| 542 | m_regInfo.WindlightSettings = m_storageManager.DataStore.LoadRegionWindlightSettings(m_regInfo.RegionID); | ||
| 543 | |||
| 542 | if (m_storageManager.EstateDataStore != null) | 544 | if (m_storageManager.EstateDataStore != null) |
| 543 | { | 545 | { |
| 544 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); | 546 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); |