diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/SQLite/SQLiteEstateData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteEstateData.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs index ffe7644..1245caa 100644 --- a/OpenSim/Data/SQLite/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs | |||
@@ -31,7 +31,7 @@ using System.Data; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using libsecondlife; | 34 | using OpenMetaverse; |
35 | using Mono.Data.SqliteClient; | 35 | using Mono.Data.SqliteClient; |
36 | using log4net; | 36 | using log4net; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
@@ -83,7 +83,7 @@ namespace OpenSim.Data.SQLite | |||
83 | get { return new List<string>(m_FieldMap.Keys).ToArray(); } | 83 | get { return new List<string>(m_FieldMap.Keys).ToArray(); } |
84 | } | 84 | } |
85 | 85 | ||
86 | public EstateSettings LoadEstateSettings(LLUUID regionID) | 86 | public EstateSettings LoadEstateSettings(UUID regionID) |
87 | { | 87 | { |
88 | EstateSettings es = new EstateSettings(); | 88 | EstateSettings es = new EstateSettings(); |
89 | es.OnSave += StoreEstateSettings; | 89 | es.OnSave += StoreEstateSettings; |
@@ -109,11 +109,11 @@ namespace OpenSim.Data.SQLite | |||
109 | else | 109 | else |
110 | m_FieldMap[name].SetValue(es, false); | 110 | m_FieldMap[name].SetValue(es, false); |
111 | } | 111 | } |
112 | else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) | 112 | else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) |
113 | { | 113 | { |
114 | LLUUID uuid = LLUUID.Zero; | 114 | UUID uuid = UUID.Zero; |
115 | 115 | ||
116 | LLUUID.TryParse(r[name].ToString(), out uuid); | 116 | UUID.TryParse(r[name].ToString(), out uuid); |
117 | m_FieldMap[name].SetValue(es, uuid); | 117 | m_FieldMap[name].SetValue(es, uuid); |
118 | } | 118 | } |
119 | else | 119 | else |
@@ -258,8 +258,8 @@ namespace OpenSim.Data.SQLite | |||
258 | { | 258 | { |
259 | EstateBan eb = new EstateBan(); | 259 | EstateBan eb = new EstateBan(); |
260 | 260 | ||
261 | LLUUID uuid = new LLUUID(); | 261 | UUID uuid = new UUID(); |
262 | LLUUID.TryParse(r["bannedUUID"].ToString(), out uuid); | 262 | UUID.TryParse(r["bannedUUID"].ToString(), out uuid); |
263 | 263 | ||
264 | eb.bannedUUID = uuid; | 264 | eb.bannedUUID = uuid; |
265 | eb.bannedIP = "0.0.0.0"; | 265 | eb.bannedIP = "0.0.0.0"; |
@@ -292,7 +292,7 @@ namespace OpenSim.Data.SQLite | |||
292 | } | 292 | } |
293 | } | 293 | } |
294 | 294 | ||
295 | void SaveUUIDList(uint EstateID, string table, LLUUID[] data) | 295 | void SaveUUIDList(uint EstateID, string table, UUID[] data) |
296 | { | 296 | { |
297 | SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); | 297 | SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); |
298 | 298 | ||
@@ -305,7 +305,7 @@ namespace OpenSim.Data.SQLite | |||
305 | 305 | ||
306 | cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )"; | 306 | cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )"; |
307 | 307 | ||
308 | foreach (LLUUID uuid in data) | 308 | foreach (UUID uuid in data) |
309 | { | 309 | { |
310 | cmd.Parameters.Add(":EstateID", EstateID.ToString()); | 310 | cmd.Parameters.Add(":EstateID", EstateID.ToString()); |
311 | cmd.Parameters.Add(":uuid", uuid.ToString()); | 311 | cmd.Parameters.Add(":uuid", uuid.ToString()); |
@@ -315,9 +315,9 @@ namespace OpenSim.Data.SQLite | |||
315 | } | 315 | } |
316 | } | 316 | } |
317 | 317 | ||
318 | LLUUID[] LoadUUIDList(uint EstateID, string table) | 318 | UUID[] LoadUUIDList(uint EstateID, string table) |
319 | { | 319 | { |
320 | List<LLUUID> uuids = new List<LLUUID>(); | 320 | List<UUID> uuids = new List<UUID>(); |
321 | 321 | ||
322 | SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); | 322 | SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); |
323 | 323 | ||
@@ -330,8 +330,8 @@ namespace OpenSim.Data.SQLite | |||
330 | { | 330 | { |
331 | // EstateBan eb = new EstateBan(); | 331 | // EstateBan eb = new EstateBan(); |
332 | 332 | ||
333 | LLUUID uuid = new LLUUID(); | 333 | UUID uuid = new UUID(); |
334 | LLUUID.TryParse(r["uuid"].ToString(), out uuid); | 334 | UUID.TryParse(r["uuid"].ToString(), out uuid); |
335 | 335 | ||
336 | uuids.Add(uuid); | 336 | uuids.Add(uuid); |
337 | } | 337 | } |