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/Data | |
parent | attempt to expire out old dynamic textures, so they don't grow forever. (diff) | |
download | opensim-SC-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.zip opensim-SC-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.tar.gz opensim-SC-bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLDataStore.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index f1a252d..69f9a16 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs | |||
@@ -736,7 +736,14 @@ namespace OpenSim.Data.MySQL | |||
736 | string searchExp = "regionUUID = '" + regionUUID.ToString() + "'"; | 736 | string searchExp = "regionUUID = '" + regionUUID.ToString() + "'"; |
737 | DataRow[] rawsettings = regionsettings.Select(searchExp); | 737 | DataRow[] rawsettings = regionsettings.Select(searchExp); |
738 | if(rawsettings.Length == 0) | 738 | if(rawsettings.Length == 0) |
739 | return null; | 739 | { |
740 | RegionSettings rs = new RegionSettings(); | ||
741 | rs.RegionUUID = regionUUID; | ||
742 | |||
743 | StoreRegionSettings(rs); | ||
744 | |||
745 | return rs; | ||
746 | } | ||
740 | DataRow row = rawsettings[0]; | 747 | DataRow row = rawsettings[0]; |
741 | 748 | ||
742 | return buildRegionSettings(row); | 749 | return buildRegionSettings(row); |