From bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Tue, 1 Jul 2008 02:16:58 +0000
Subject: 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.

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

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
             // Load region settings
             // First try database
             m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID);
-            // If the database access failed, this will create defaults
-            m_regInfo.RegionSettings.RegionUUID = m_regInfo.RegionID;
-            // Finally, save the defaults
-            m_storageManager.DataStore.StoreRegionSettings(m_regInfo.RegionSettings);
+
+            // Hook up save event
+            m_regInfo.RegionSettings.OnSave +=  m_storageManager.DataStore.StoreRegionSettings;
+
 
             //Bind Storage Manager functions to some land manager functions for this scene
             EventManager.OnLandObjectAdded +=
-- 
cgit v1.1