diff options
| author | Charles Krinke | 2008-07-01 02:16:58 +0000 |
|---|---|---|
| committer | Charles Krinke | 2008-07-01 02:16:58 +0000 |
| commit | bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9 (patch) | |
| tree | 89dfa6403fc935f8273f12536c0f1290c3778068 /OpenSim/Region | |
| parent | attempt to expire out old dynamic textures, so they don't grow forever. (diff) | |
| download | opensim-SC_OLD-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.zip opensim-SC_OLD-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.tar.gz opensim-SC_OLD-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.tar.bz2 opensim-SC_OLD-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.tar.xz | |
Mantis#1639. Thank you, Melanie for a patch that:
Reads estate_settings.xml and populates the database from it.
If there is no record, just passes the defaults to the application.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 12c909b..12d7bcd 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -267,10 +267,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 267 | // Load region settings | 267 | // Load region settings |
| 268 | // First try database | 268 | // First try database |
| 269 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); | 269 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); |
| 270 | // If the database access failed, this will create defaults | 270 | |
| 271 | m_regInfo.RegionSettings.RegionUUID = m_regInfo.RegionID; | 271 | // Hook up save event |
| 272 | // Finally, save the defaults | 272 | m_regInfo.RegionSettings.OnSave += m_storageManager.DataStore.StoreRegionSettings; |
| 273 | m_storageManager.DataStore.StoreRegionSettings(m_regInfo.RegionSettings); | 273 | |
| 274 | 274 | ||
| 275 | //Bind Storage Manager functions to some land manager functions for this scene | 275 | //Bind Storage Manager functions to some land manager functions for this scene |
| 276 | EventManager.OnLandObjectAdded += | 276 | EventManager.OnLandObjectAdded += |