diff options
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteEstateData.cs | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index 1be99ee..4a447d2 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Data.SQLite | |||
80 | get { return new List<string>(m_FieldMap.Keys).ToArray(); } | 80 | get { return new List<string>(m_FieldMap.Keys).ToArray(); } |
81 | } | 81 | } |
82 | 82 | ||
83 | public EstateSettings LoadEstateSettings(UUID regionID) | 83 | public EstateSettings LoadEstateSettings(UUID regionID, bool create) |
84 | { | 84 | { |
85 | EstateSettings es = new EstateSettings(); | 85 | EstateSettings es = new EstateSettings(); |
86 | es.OnSave += StoreEstateSettings; | 86 | es.OnSave += StoreEstateSettings; |
@@ -120,10 +120,8 @@ namespace OpenSim.Data.SQLite | |||
120 | } | 120 | } |
121 | r.Close(); | 121 | r.Close(); |
122 | } | 122 | } |
123 | else | 123 | else if (create) |
124 | { | 124 | { |
125 | // Migration case | ||
126 | // | ||
127 | r.Close(); | 125 | r.Close(); |
128 | 126 | ||
129 | List<string> names = new List<string>(FieldList); | 127 | List<string> names = new List<string>(FieldList); |
@@ -176,20 +174,6 @@ namespace OpenSim.Data.SQLite | |||
176 | { | 174 | { |
177 | } | 175 | } |
178 | 176 | ||
179 | // Munge and transfer the ban list | ||
180 | // | ||
181 | cmd.Parameters.Clear(); | ||
182 | cmd.CommandText = "insert into estateban select "+es.EstateID.ToString()+", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = :UUID"; | ||
183 | cmd.Parameters.Add(":UUID", regionID.ToString()); | ||
184 | |||
185 | try | ||
186 | { | ||
187 | cmd.ExecuteNonQuery(); | ||
188 | } | ||
189 | catch (Exception) | ||
190 | { | ||
191 | } | ||
192 | |||
193 | es.Save(); | 177 | es.Save(); |
194 | } | 178 | } |
195 | 179 | ||