aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/SQLite
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-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 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs10
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs26
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs12
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs54
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs128
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs90
7 files changed, 163 insertions, 163 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 220cebf..8b14f09 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenSim.Framework; 34using OpenSim.Framework;
@@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLite
87 /// </summary> 87 /// </summary>
88 /// <param name="uuid">UUID of ... ?</param> 88 /// <param name="uuid">UUID of ... ?</param>
89 /// <returns>Asset base</returns> 89 /// <returns>Asset base</returns>
90 override public AssetBase FetchAsset(LLUUID uuid) 90 override public AssetBase FetchAsset(UUID uuid)
91 { 91 {
92 lock (this) 92 lock (this)
93 { 93 {
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
190 /// </summary> 190 /// </summary>
191 /// <param name="uuid">The asset UUID</param> 191 /// <param name="uuid">The asset UUID</param>
192 /// <returns>True if exist, or false.</returns> 192 /// <returns>True if exist, or false.</returns>
193 override public bool ExistsAsset(LLUUID uuid) 193 override public bool ExistsAsset(UUID uuid)
194 { 194 {
195 lock (this) { 195 lock (this) {
196 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) 196 using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
@@ -217,7 +217,7 @@ namespace OpenSim.Data.SQLite
217 /// Delete an asset from database 217 /// Delete an asset from database
218 /// </summary> 218 /// </summary>
219 /// <param name="uuid"></param> 219 /// <param name="uuid"></param>
220 public void DeleteAsset(LLUUID uuid) 220 public void DeleteAsset(UUID uuid)
221 { 221 {
222 using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) 222 using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
223 { 223 {
@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite
239 // back out. Not enough time to figure it out yet. 239 // back out. Not enough time to figure it out yet.
240 AssetBase asset = new AssetBase(); 240 AssetBase asset = new AssetBase();
241 241
242 asset.FullID = new LLUUID((String) row["UUID"]); 242 asset.FullID = new UUID((String) row["UUID"]);
243 asset.Name = (String) row["Name"]; 243 asset.Name = (String) row["Name"];
244 asset.Description = (String) row["Description"]; 244 asset.Description = (String) row["Description"];
245 asset.Type = Convert.ToSByte(row["Type"]); 245 asset.Type = Convert.ToSByte(row["Type"]);
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;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using 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 }
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 8c4574e..f715c0e 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.Reflection; 31using System.Reflection;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
@@ -162,7 +162,7 @@ namespace OpenSim.Data.SQLite
162 /// </summary> 162 /// </summary>
163 /// <param name="uuid">The region UUID</param> 163 /// <param name="uuid">The region UUID</param>
164 /// <returns>The sim profile</returns> 164 /// <returns>The sim profile</returns>
165 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 165 override public RegionProfileData GetProfileByUUID(UUID uuid)
166 { 166 {
167 Dictionary<string, string> param = new Dictionary<string, string>(); 167 Dictionary<string, string> param = new Dictionary<string, string>();
168 param["uuid"] = uuid.ToString(); 168 param["uuid"] = uuid.ToString();
@@ -181,7 +181,7 @@ namespace OpenSim.Data.SQLite
181 /// Returns a list of avatar and UUIDs that match the query 181 /// Returns a list of avatar and UUIDs that match the query
182 /// </summary> 182 /// </summary>
183 /// <remarks>do nothing yet</remarks> 183 /// <remarks>do nothing yet</remarks>
184 public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 184 public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
185 { 185 {
186 //Do nothing yet 186 //Do nothing yet
187 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 187 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
@@ -217,14 +217,14 @@ namespace OpenSim.Data.SQLite
217 /// <param name="handle">The attempted regionHandle of the challenger</param> 217 /// <param name="handle">The attempted regionHandle of the challenger</param>
218 /// <param name="authkey">The secret</param> 218 /// <param name="authkey">The secret</param>
219 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 219 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
220 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 220 override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
221 { 221 {
222 bool throwHissyFit = false; // Should be true by 1.0 222 bool throwHissyFit = false; // Should be true by 1.0
223 223
224 if (throwHissyFit) 224 if (throwHissyFit)
225 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 225 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
226 226
227 RegionProfileData data = GetProfileByLLUUID(uuid); 227 RegionProfileData data = GetProfileByUUID(uuid);
228 228
229 return (handle == data.regionHandle && authkey == data.regionSecret); 229 return (handle == data.regionHandle && authkey == data.regionSecret);
230 } 230 }
@@ -238,7 +238,7 @@ namespace OpenSim.Data.SQLite
238 /// <param name="authhash"></param> 238 /// <param name="authhash"></param>
239 /// <param name="challenge"></param> 239 /// <param name="challenge"></param>
240 /// <returns></returns> 240 /// <returns></returns>
241 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 241 public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
242 { 242 {
243 // SHA512Managed HashProvider = new SHA512Managed(); 243 // SHA512Managed HashProvider = new SHA512Managed();
244 // Encoding TextProvider = new UTF8Encoding(); 244 // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 4c35ac2..ca7e612 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -109,13 +109,13 @@ namespace OpenSim.Data.SQLite
109 public InventoryItemBase buildItem(DataRow row) 109 public InventoryItemBase buildItem(DataRow row)
110 { 110 {
111 InventoryItemBase item = new InventoryItemBase(); 111 InventoryItemBase item = new InventoryItemBase();
112 item.ID = new LLUUID((string) row["UUID"]); 112 item.ID = new UUID((string) row["UUID"]);
113 item.AssetID = new LLUUID((string) row["assetID"]); 113 item.AssetID = new UUID((string) row["assetID"]);
114 item.AssetType = Convert.ToInt32(row["assetType"]); 114 item.AssetType = Convert.ToInt32(row["assetType"]);
115 item.InvType = Convert.ToInt32(row["invType"]); 115 item.InvType = Convert.ToInt32(row["invType"]);
116 item.Folder = new LLUUID((string) row["parentFolderID"]); 116 item.Folder = new UUID((string) row["parentFolderID"]);
117 item.Owner = new LLUUID((string) row["avatarID"]); 117 item.Owner = new UUID((string) row["avatarID"]);
118 item.Creator = new LLUUID((string) row["creatorsID"]); 118 item.Creator = new UUID((string) row["creatorsID"]);
119 item.Name = (string) row["inventoryName"]; 119 item.Name = (string) row["inventoryName"];
120 item.Description = (string) row["inventoryDescription"]; 120 item.Description = (string) row["inventoryDescription"];
121 121
@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
135 item.CreationDate = Convert.ToInt32(row["creationDate"]); 135 item.CreationDate = Convert.ToInt32(row["creationDate"]);
136 136
137 if (!Convert.IsDBNull(row["groupID"])) 137 if (!Convert.IsDBNull(row["groupID"]))
138 item.GroupID = new LLUUID((string)row["groupID"]); 138 item.GroupID = new UUID((string)row["groupID"]);
139 139
140 if (!Convert.IsDBNull(row["groupOwned"])) 140 if (!Convert.IsDBNull(row["groupOwned"]))
141 item.GroupOwned = Convert.ToBoolean(row["groupOwned"]); 141 item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
@@ -317,7 +317,7 @@ namespace OpenSim.Data.SQLite
317 /// </summary> 317 /// </summary>
318 /// <param name="folderID">The UUID of the target folder</param> 318 /// <param name="folderID">The UUID of the target folder</param>
319 /// <returns>A List of InventoryItemBase items</returns> 319 /// <returns>A List of InventoryItemBase items</returns>
320 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 320 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
321 { 321 {
322 lock (ds) 322 lock (ds)
323 { 323 {
@@ -339,20 +339,20 @@ namespace OpenSim.Data.SQLite
339 /// </summary> 339 /// </summary>
340 /// <param name="user">The user whos inventory is to be searched</param> 340 /// <param name="user">The user whos inventory is to be searched</param>
341 /// <returns>A list of folder objects</returns> 341 /// <returns>A list of folder objects</returns>
342 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 342 public List<InventoryFolderBase> getUserRootFolders(UUID user)
343 { 343 {
344 return new List<InventoryFolderBase>(); 344 return new List<InventoryFolderBase>();
345 } 345 }
346 346
347 // see InventoryItemBase.getUserRootFolder 347 // see InventoryItemBase.getUserRootFolder
348 public InventoryFolderBase getUserRootFolder(LLUUID user) 348 public InventoryFolderBase getUserRootFolder(UUID user)
349 { 349 {
350 lock (ds) 350 lock (ds)
351 { 351 {
352 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 352 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
353 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"]; 353 DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
354 string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" + 354 string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" +
355 Util.ToRawUuidString(LLUUID.Zero) + "'"; 355 Util.ToRawUuidString(UUID.Zero) + "'";
356 DataRow[] rows = inventoryFolderTable.Select(selectExp); 356 DataRow[] rows = inventoryFolderTable.Select(selectExp);
357 foreach (DataRow row in rows) 357 foreach (DataRow row in rows)
358 { 358 {
@@ -378,7 +378,7 @@ namespace OpenSim.Data.SQLite
378 /// </summary> 378 /// </summary>
379 /// <param name="folders">list where folders will be appended</param> 379 /// <param name="folders">list where folders will be appended</param>
380 /// <param name="parentID">ID of parent</param> 380 /// <param name="parentID">ID of parent</param>
381 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 381 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
382 { 382 {
383 lock (ds) 383 lock (ds)
384 { 384 {
@@ -398,7 +398,7 @@ namespace OpenSim.Data.SQLite
398 /// </summary> 398 /// </summary>
399 /// <param name="parentID">The folder to get subfolders for</param> 399 /// <param name="parentID">The folder to get subfolders for</param>
400 /// <returns>A list of inventory folders</returns> 400 /// <returns>A list of inventory folders</returns>
401 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 401 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
402 { 402 {
403 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 403 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
404 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID)); 404 getInventoryFolders(ref folders, Util.ToRawUuidString(parentID));
@@ -410,7 +410,7 @@ namespace OpenSim.Data.SQLite
410 /// </summary> 410 /// </summary>
411 /// <param name="parentID"></param> 411 /// <param name="parentID"></param>
412 /// <returns></returns> 412 /// <returns></returns>
413 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 413 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
414 { 414 {
415 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one 415 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
416 * - We will only need to hit the database twice instead of n times. 416 * - We will only need to hit the database twice instead of n times.
@@ -441,7 +441,7 @@ namespace OpenSim.Data.SQLite
441 if (parentRow.GetLength(0) >= 1) // No result means parent folder does not exist 441 if (parentRow.GetLength(0) >= 1) // No result means parent folder does not exist
442 { 442 {
443 parentFolder = buildFolder(parentRow[0]); 443 parentFolder = buildFolder(parentRow[0]);
444 LLUUID agentID = parentFolder.Owner; 444 UUID agentID = parentFolder.Owner;
445 selectExp = "agentID = '" + Util.ToRawUuidString(agentID) + "'"; 445 selectExp = "agentID = '" + Util.ToRawUuidString(agentID) + "'";
446 folderRows = inventoryFolderTable.Select(selectExp); 446 folderRows = inventoryFolderTable.Select(selectExp);
447 } 447 }
@@ -451,7 +451,7 @@ namespace OpenSim.Data.SQLite
451 /* if we're querying the root folder, just return an unordered list of all folders in the user's 451 /* if we're querying the root folder, just return an unordered list of all folders in the user's
452 * inventory 452 * inventory
453 */ 453 */
454 if (parentFolder.ParentID == LLUUID.Zero) 454 if (parentFolder.ParentID == UUID.Zero)
455 { 455 {
456 foreach (DataRow row in folderRows) 456 foreach (DataRow row in folderRows)
457 { 457 {
@@ -470,13 +470,13 @@ namespace OpenSim.Data.SQLite
470 { // Querying a non-root folder 470 { // Querying a non-root folder
471 471
472 // Build a hash table of all user's inventory folders, indexed by each folder's parent ID 472 // Build a hash table of all user's inventory folders, indexed by each folder's parent ID
473 Dictionary<LLUUID, List<InventoryFolderBase>> hashtable = 473 Dictionary<UUID, List<InventoryFolderBase>> hashtable =
474 new Dictionary<LLUUID, List<InventoryFolderBase>>(folderRows.GetLength(0)); 474 new Dictionary<UUID, List<InventoryFolderBase>>(folderRows.GetLength(0));
475 475
476 foreach (DataRow row in folderRows) 476 foreach (DataRow row in folderRows)
477 { 477 {
478 InventoryFolderBase curFolder = buildFolder(row); 478 InventoryFolderBase curFolder = buildFolder(row);
479 if (curFolder.ParentID != LLUUID.Zero) // Discard root of tree - not needed 479 if (curFolder.ParentID != UUID.Zero) // Discard root of tree - not needed
480 { 480 {
481 if (hashtable.ContainsKey(curFolder.ParentID)) 481 if (hashtable.ContainsKey(curFolder.ParentID))
482 { 482 {
@@ -514,7 +514,7 @@ namespace OpenSim.Data.SQLite
514 /// </summary> 514 /// </summary>
515 /// <param name="item">The UUID of the item to be returned</param> 515 /// <param name="item">The UUID of the item to be returned</param>
516 /// <returns>A class containing item information</returns> 516 /// <returns>A class containing item information</returns>
517 public InventoryItemBase getInventoryItem(LLUUID item) 517 public InventoryItemBase getInventoryItem(UUID item)
518 { 518 {
519 lock (ds) 519 lock (ds)
520 { 520 {
@@ -535,7 +535,7 @@ namespace OpenSim.Data.SQLite
535 /// </summary> 535 /// </summary>
536 /// <param name="folder">The UUID of the folder to be returned</param> 536 /// <param name="folder">The UUID of the folder to be returned</param>
537 /// <returns>A class containing folder information</returns> 537 /// <returns>A class containing folder information</returns>
538 public InventoryFolderBase getInventoryFolder(LLUUID folder) 538 public InventoryFolderBase getInventoryFolder(UUID folder)
539 { 539 {
540 // TODO: Deep voodoo here. If you enable this code then 540 // TODO: Deep voodoo here. If you enable this code then
541 // multi region breaks. No idea why, but I figured it was 541 // multi region breaks. No idea why, but I figured it was
@@ -578,7 +578,7 @@ namespace OpenSim.Data.SQLite
578 /// Delete an inventory item 578 /// Delete an inventory item
579 /// </summary> 579 /// </summary>
580 /// <param name="item">The item UUID</param> 580 /// <param name="item">The item UUID</param>
581 public void deleteInventoryItem(LLUUID itemID) 581 public void deleteInventoryItem(UUID itemID)
582 { 582 {
583 lock (ds) 583 lock (ds)
584 { 584 {
@@ -599,7 +599,7 @@ namespace OpenSim.Data.SQLite
599 /// </summary> 599 /// </summary>
600 /// <param name="folderId">id of the folder, whose item content should be deleted</param> 600 /// <param name="folderId">id of the folder, whose item content should be deleted</param>
601 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo> 601 /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo>
602 private void deleteItemsInFolder(LLUUID folderId) 602 private void deleteItemsInFolder(UUID folderId)
603 { 603 {
604 List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId)); 604 List<InventoryItemBase> items = getInventoryInFolder(Util.ToRawUuidString(folderId));
605 605
@@ -641,7 +641,7 @@ namespace OpenSim.Data.SQLite
641 /// This will clean-up any child folders and child items as well 641 /// This will clean-up any child folders and child items as well
642 /// </remarks> 642 /// </remarks>
643 /// <param name="folderID">the folder UUID</param> 643 /// <param name="folderID">the folder UUID</param>
644 public void deleteInventoryFolder(LLUUID folderID) 644 public void deleteInventoryFolder(UUID folderID)
645 { 645 {
646 lock (ds) 646 lock (ds)
647 { 647 {
@@ -791,10 +791,10 @@ namespace OpenSim.Data.SQLite
791 private static InventoryFolderBase buildFolder(DataRow row) 791 private static InventoryFolderBase buildFolder(DataRow row)
792 { 792 {
793 InventoryFolderBase folder = new InventoryFolderBase(); 793 InventoryFolderBase folder = new InventoryFolderBase();
794 folder.ID = new LLUUID((string) row["UUID"]); 794 folder.ID = new UUID((string) row["UUID"]);
795 folder.Name = (string) row["name"]; 795 folder.Name = (string) row["name"];
796 folder.Owner = new LLUUID((string) row["agentID"]); 796 folder.Owner = new UUID((string) row["agentID"]);
797 folder.ParentID = new LLUUID((string) row["parentID"]); 797 folder.ParentID = new UUID((string) row["parentID"]);
798 folder.Type = Convert.ToInt16(row["type"]); 798 folder.Type = Convert.ToInt16(row["type"]);
799 folder.Version = Convert.ToUInt16(row["version"]); 799 folder.Version = Convert.ToUInt16(row["version"]);
800 return folder; 800 return folder;
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index 46c40e5..4a7e910 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
@@ -118,7 +118,7 @@ namespace OpenSim.Data.SQLite
118 // Region Main 118 // Region Main
119 retval.regionHandle = (ulong) reader["regionHandle"]; 119 retval.regionHandle = (ulong) reader["regionHandle"];
120 retval.regionName = (string) reader["regionName"]; 120 retval.regionName = (string) reader["regionName"];
121 retval.UUID = new LLUUID((string) reader["uuid"]); 121 retval.UUID = new UUID((string) reader["uuid"]);
122 122
123 // Secrets 123 // Secrets
124 retval.regionRecvKey = (string) reader["regionRecvKey"]; 124 retval.regionRecvKey = (string) reader["regionRecvKey"];
@@ -182,7 +182,7 @@ namespace OpenSim.Data.SQLite
182 182
183 parameters["regionHandle"] = profile.regionHandle.ToString(); 183 parameters["regionHandle"] = profile.regionHandle.ToString();
184 parameters["regionName"] = profile.regionName; 184 parameters["regionName"] = profile.regionName;
185 parameters["uuid"] = profile.UUID.ToString(); 185 parameters["uuid"] = profile.ToString();
186 parameters["regionRecvKey"] = profile.regionRecvKey; 186 parameters["regionRecvKey"] = profile.regionRecvKey;
187 parameters["regionSendKey"] = profile.regionSendKey; 187 parameters["regionSendKey"] = profile.regionSendKey;
188 parameters["regionDataURI"] = profile.regionDataURI; 188 parameters["regionDataURI"] = profile.regionDataURI;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index dd88751..bb441f6 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using Mono.Data.SqliteClient; 36using Mono.Data.SqliteClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
190 { 190 {
191 } 191 }
192 192
193 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 193 public RegionSettings LoadRegionSettings(UUID regionUUID)
194 { 194 {
195 return null; 195 return null;
196 } 196 }
@@ -200,15 +200,15 @@ namespace OpenSim.Data.SQLite
200 /// </summary> 200 /// </summary>
201 /// <param name="obj">the object</param> 201 /// <param name="obj">the object</param>
202 /// <param name="regionUUID">the region UUID</param> 202 /// <param name="regionUUID">the region UUID</param>
203 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 203 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
204 { 204 {
205 lock (ds) 205 lock (ds)
206 { 206 {
207 foreach (SceneObjectPart prim in obj.Children.Values) 207 foreach (SceneObjectPart prim in obj.Children.Values)
208 { 208 {
209 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0 209 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
210 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 210 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
211 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) 211 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
212 { 212 {
213 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 213 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
214 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID)); 214 addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
@@ -235,9 +235,9 @@ namespace OpenSim.Data.SQLite
235 /// </summary> 235 /// </summary>
236 /// <param name="obj">the object</param> 236 /// <param name="obj">the object</param>
237 /// <param name="regionUUID">the region UUID</param> 237 /// <param name="regionUUID">the region UUID</param>
238 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 238 public void RemoveObject(UUID obj, UUID regionUUID)
239 { 239 {
240 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 240 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
241 241
242 DataTable prims = ds.Tables["prims"]; 242 DataTable prims = ds.Tables["prims"];
243 DataTable shapes = ds.Tables["primshapes"]; 243 DataTable shapes = ds.Tables["primshapes"];
@@ -249,7 +249,7 @@ namespace OpenSim.Data.SQLite
249 foreach (DataRow row in primRows) 249 foreach (DataRow row in primRows)
250 { 250 {
251 // Remove shape rows 251 // Remove shape rows
252 LLUUID uuid = new LLUUID((string) row["UUID"]); 252 UUID uuid = new UUID((string) row["UUID"]);
253 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid)); 253 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
254 if (shapeRow != null) 254 if (shapeRow != null)
255 { 255 {
@@ -271,7 +271,7 @@ namespace OpenSim.Data.SQLite
271 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes. 271 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
272 /// </summary> 272 /// </summary>
273 /// <param name="uuid">The item UUID</param> 273 /// <param name="uuid">The item UUID</param>
274 private void RemoveItems(LLUUID uuid) 274 private void RemoveItems(UUID uuid)
275 { 275 {
276 DataTable items = ds.Tables["primitems"]; 276 DataTable items = ds.Tables["primitems"];
277 277
@@ -289,9 +289,9 @@ namespace OpenSim.Data.SQLite
289 /// </summary> 289 /// </summary>
290 /// <param name="regionUUID">The region UUID</param> 290 /// <param name="regionUUID">The region UUID</param>
291 /// <returns>List of loaded groups</returns> 291 /// <returns>List of loaded groups</returns>
292 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 292 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
293 { 293 {
294 Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); 294 Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
295 295
296 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); 296 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
297 297
@@ -350,7 +350,7 @@ namespace OpenSim.Data.SQLite
350 "[REGION DB]: No shape found for prim in storage, so setting default box shape"); 350 "[REGION DB]: No shape found for prim in storage, so setting default box shape");
351 prim.Shape = PrimitiveBaseShape.Default; 351 prim.Shape = PrimitiveBaseShape.Default;
352 } 352 }
353 createdObjects[new LLUUID(objID)].AddPart(prim); 353 createdObjects[new UUID(objID)].AddPart(prim);
354 } 354 }
355 355
356 LoadItems(prim); 356 LoadItems(prim);
@@ -379,7 +379,7 @@ namespace OpenSim.Data.SQLite
379 379
380 DataTable dbItems = ds.Tables["primitems"]; 380 DataTable dbItems = ds.Tables["primitems"];
381 381
382 String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); 382 String sql = String.Format("primID = '{0}'", prim.ToString());
383 DataRow[] dbItemRows = dbItems.Select(sql); 383 DataRow[] dbItemRows = dbItems.Select(sql);
384 384
385 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>(); 385 IList<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
@@ -407,7 +407,7 @@ namespace OpenSim.Data.SQLite
407 /// </summary> 407 /// </summary>
408 /// <param name="ter">terrain heightfield</param> 408 /// <param name="ter">terrain heightfield</param>
409 /// <param name="regionID">region UUID</param> 409 /// <param name="regionID">region UUID</param>
410 public void StoreTerrain(double[,] ter, LLUUID regionID) 410 public void StoreTerrain(double[,] ter, UUID regionID)
411 { 411 {
412 lock (ds) 412 lock (ds)
413 { 413 {
@@ -451,7 +451,7 @@ namespace OpenSim.Data.SQLite
451 /// </summary> 451 /// </summary>
452 /// <param name="regionID">the region UUID</param> 452 /// <param name="regionID">the region UUID</param>
453 /// <returns>Heightfield data</returns> 453 /// <returns>Heightfield data</returns>
454 public double[,] LoadTerrain(LLUUID regionID) 454 public double[,] LoadTerrain(UUID regionID)
455 { 455 {
456 lock (ds) 456 lock (ds)
457 { 457 {
@@ -499,7 +499,7 @@ namespace OpenSim.Data.SQLite
499 /// 499 ///
500 /// </summary> 500 /// </summary>
501 /// <param name="globalID"></param> 501 /// <param name="globalID"></param>
502 public void RemoveLandObject(LLUUID globalID) 502 public void RemoveLandObject(UUID globalID)
503 { 503 {
504 lock (ds) 504 lock (ds)
505 { 505 {
@@ -563,7 +563,7 @@ namespace OpenSim.Data.SQLite
563 /// </summary> 563 /// </summary>
564 /// <param name="regionUUID"></param> 564 /// <param name="regionUUID"></param>
565 /// <returns></returns> 565 /// <returns></returns>
566 public List<LandData> LoadLandObjects(LLUUID regionUUID) 566 public List<LandData> LoadLandObjects(UUID regionUUID)
567 { 567 {
568 List<LandData> landDataForRegion = new List<LandData>(); 568 List<LandData> landDataForRegion = new List<LandData>();
569 lock (ds) 569 lock (ds)
@@ -821,12 +821,12 @@ namespace OpenSim.Data.SQLite
821 createCol(land, "IsGroupOwned", typeof (Boolean)); 821 createCol(land, "IsGroupOwned", typeof (Boolean));
822 createCol(land, "Area", typeof (Int32)); 822 createCol(land, "Area", typeof (Int32));
823 createCol(land, "AuctionID", typeof (Int32)); //Unemplemented 823 createCol(land, "AuctionID", typeof (Int32)); //Unemplemented
824 createCol(land, "Category", typeof (Int32)); //Enum libsecondlife.Parcel.ParcelCategory 824 createCol(land, "Category", typeof (Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
825 createCol(land, "ClaimDate", typeof (Int32)); 825 createCol(land, "ClaimDate", typeof (Int32));
826 createCol(land, "ClaimPrice", typeof (Int32)); 826 createCol(land, "ClaimPrice", typeof (Int32));
827 createCol(land, "GroupUUID", typeof (string)); 827 createCol(land, "GroupUUID", typeof (string));
828 createCol(land, "SalePrice", typeof (Int32)); 828 createCol(land, "SalePrice", typeof (Int32));
829 createCol(land, "LandStatus", typeof (Int32)); //Enum. libsecondlife.Parcel.ParcelStatus 829 createCol(land, "LandStatus", typeof (Int32)); //Enum. OpenMetaverse.Parcel.ParcelStatus
830 createCol(land, "LandFlags", typeof (UInt32)); 830 createCol(land, "LandFlags", typeof (UInt32));
831 createCol(land, "LandingType", typeof (Byte)); 831 createCol(land, "LandingType", typeof (Byte));
832 createCol(land, "MediaAutoScale", typeof (Byte)); 832 createCol(land, "MediaAutoScale", typeof (Byte));
@@ -882,7 +882,7 @@ namespace OpenSim.Data.SQLite
882 // interesting has to be done to actually get these values 882 // interesting has to be done to actually get these values
883 // back out. Not enough time to figure it out yet. 883 // back out. Not enough time to figure it out yet.
884 SceneObjectPart prim = new SceneObjectPart(); 884 SceneObjectPart prim = new SceneObjectPart();
885 prim.UUID = new LLUUID((String) row["UUID"]); 885 prim.UUID = new UUID((String) row["UUID"]);
886 // explicit conversion of integers is required, which sort 886 // explicit conversion of integers is required, which sort
887 // of sucks. No idea if there is a shortcut here or not. 887 // of sucks. No idea if there is a shortcut here or not.
888 prim.ParentID = Convert.ToUInt32(row["ParentID"]); 888 prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -895,43 +895,43 @@ namespace OpenSim.Data.SQLite
895 prim.TouchName = (String) row["TouchName"]; 895 prim.TouchName = (String) row["TouchName"];
896 // permissions 896 // permissions
897 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 897 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
898 prim.CreatorID = new LLUUID((String) row["CreatorID"]); 898 prim.CreatorID = new UUID((String) row["CreatorID"]);
899 prim.OwnerID = new LLUUID((String) row["OwnerID"]); 899 prim.OwnerID = new UUID((String) row["OwnerID"]);
900 prim.GroupID = new LLUUID((String) row["GroupID"]); 900 prim.GroupID = new UUID((String) row["GroupID"]);
901 prim.LastOwnerID = new LLUUID((String) row["LastOwnerID"]); 901 prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
902 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); 902 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
903 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); 903 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
904 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); 904 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
905 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]); 905 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
906 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); 906 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
907 // vectors 907 // vectors
908 prim.OffsetPosition = new LLVector3( 908 prim.OffsetPosition = new Vector3(
909 Convert.ToSingle(row["PositionX"]), 909 Convert.ToSingle(row["PositionX"]),
910 Convert.ToSingle(row["PositionY"]), 910 Convert.ToSingle(row["PositionY"]),
911 Convert.ToSingle(row["PositionZ"]) 911 Convert.ToSingle(row["PositionZ"])
912 ); 912 );
913 prim.GroupPosition = new LLVector3( 913 prim.GroupPosition = new Vector3(
914 Convert.ToSingle(row["GroupPositionX"]), 914 Convert.ToSingle(row["GroupPositionX"]),
915 Convert.ToSingle(row["GroupPositionY"]), 915 Convert.ToSingle(row["GroupPositionY"]),
916 Convert.ToSingle(row["GroupPositionZ"]) 916 Convert.ToSingle(row["GroupPositionZ"])
917 ); 917 );
918 prim.Velocity = new LLVector3( 918 prim.Velocity = new Vector3(
919 Convert.ToSingle(row["VelocityX"]), 919 Convert.ToSingle(row["VelocityX"]),
920 Convert.ToSingle(row["VelocityY"]), 920 Convert.ToSingle(row["VelocityY"]),
921 Convert.ToSingle(row["VelocityZ"]) 921 Convert.ToSingle(row["VelocityZ"])
922 ); 922 );
923 prim.AngularVelocity = new LLVector3( 923 prim.AngularVelocity = new Vector3(
924 Convert.ToSingle(row["AngularVelocityX"]), 924 Convert.ToSingle(row["AngularVelocityX"]),
925 Convert.ToSingle(row["AngularVelocityY"]), 925 Convert.ToSingle(row["AngularVelocityY"]),
926 Convert.ToSingle(row["AngularVelocityZ"]) 926 Convert.ToSingle(row["AngularVelocityZ"])
927 ); 927 );
928 prim.Acceleration = new LLVector3( 928 prim.Acceleration = new Vector3(
929 Convert.ToSingle(row["AccelerationX"]), 929 Convert.ToSingle(row["AccelerationX"]),
930 Convert.ToSingle(row["AccelerationY"]), 930 Convert.ToSingle(row["AccelerationY"]),
931 Convert.ToSingle(row["AccelerationZ"]) 931 Convert.ToSingle(row["AccelerationZ"])
932 ); 932 );
933 // quaternions 933 // quaternions
934 prim.RotationOffset = new LLQuaternion( 934 prim.RotationOffset = new Quaternion(
935 Convert.ToSingle(row["RotationX"]), 935 Convert.ToSingle(row["RotationX"]),
936 Convert.ToSingle(row["RotationY"]), 936 Convert.ToSingle(row["RotationY"]),
937 Convert.ToSingle(row["RotationZ"]), 937 Convert.ToSingle(row["RotationZ"]),
@@ -940,11 +940,11 @@ namespace OpenSim.Data.SQLite
940 940
941 try 941 try
942 { 942 {
943 prim.SitTargetPositionLL = new LLVector3( 943 prim.SitTargetPositionLL = new Vector3(
944 Convert.ToSingle(row["SitTargetOffsetX"]), 944 Convert.ToSingle(row["SitTargetOffsetX"]),
945 Convert.ToSingle(row["SitTargetOffsetY"]), 945 Convert.ToSingle(row["SitTargetOffsetY"]),
946 Convert.ToSingle(row["SitTargetOffsetZ"])); 946 Convert.ToSingle(row["SitTargetOffsetZ"]));
947 prim.SitTargetOrientationLL = new LLQuaternion( 947 prim.SitTargetOrientationLL = new Quaternion(
948 Convert.ToSingle( 948 Convert.ToSingle(
949 row["SitTargetOrientX"]), 949 row["SitTargetOrientX"]),
950 Convert.ToSingle( 950 Convert.ToSingle(
@@ -993,10 +993,10 @@ namespace OpenSim.Data.SQLite
993 { 993 {
994 TaskInventoryItem taskItem = new TaskInventoryItem(); 994 TaskInventoryItem taskItem = new TaskInventoryItem();
995 995
996 taskItem.ItemID = new LLUUID((String)row["itemID"]); 996 taskItem.ItemID = new UUID((String)row["itemID"]);
997 taskItem.ParentPartID = new LLUUID((String)row["primID"]); 997 taskItem.ParentPartID = new UUID((String)row["primID"]);
998 taskItem.AssetID = new LLUUID((String)row["assetID"]); 998 taskItem.AssetID = new UUID((String)row["assetID"]);
999 taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); 999 taskItem.ParentID = new UUID((String)row["parentFolderID"]);
1000 1000
1001 taskItem.InvType = Convert.ToInt32(row["invType"]); 1001 taskItem.InvType = Convert.ToInt32(row["invType"]);
1002 taskItem.Type = Convert.ToInt32(row["assetType"]); 1002 taskItem.Type = Convert.ToInt32(row["assetType"]);
@@ -1004,10 +1004,10 @@ namespace OpenSim.Data.SQLite
1004 taskItem.Name = (String)row["name"]; 1004 taskItem.Name = (String)row["name"];
1005 taskItem.Description = (String)row["description"]; 1005 taskItem.Description = (String)row["description"];
1006 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1006 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1007 taskItem.CreatorID = new LLUUID((String)row["creatorID"]); 1007 taskItem.CreatorID = new UUID((String)row["creatorID"]);
1008 taskItem.OwnerID = new LLUUID((String)row["ownerID"]); 1008 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1009 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1009 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1010 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1010 taskItem.GroupID = new UUID((String)row["groupID"]);
1011 1011
1012 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); 1012 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1013 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); 1013 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
@@ -1028,7 +1028,7 @@ namespace OpenSim.Data.SQLite
1028 { 1028 {
1029 LandData newData = new LandData(); 1029 LandData newData = new LandData();
1030 1030
1031 newData.GlobalID = new LLUUID((String) row["UUID"]); 1031 newData.GlobalID = new UUID((String) row["UUID"]);
1032 newData.LocalID = Convert.ToInt32(row["LocalLandID"]); 1032 newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
1033 1033
1034 // Bitmap is a byte[512] 1034 // Bitmap is a byte[512]
@@ -1041,17 +1041,17 @@ namespace OpenSim.Data.SQLite
1041 newData.Area = Convert.ToInt32(row["Area"]); 1041 newData.Area = Convert.ToInt32(row["Area"]);
1042 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented 1042 newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
1043 newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]); 1043 newData.Category = (Parcel.ParcelCategory) Convert.ToInt32(row["Category"]);
1044 //Enum libsecondlife.Parcel.ParcelCategory 1044 //Enum OpenMetaverse.Parcel.ParcelCategory
1045 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 1045 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1046 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 1046 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1047 newData.GroupID = new LLUUID((String) row["GroupUUID"]); 1047 newData.GroupID = new UUID((String) row["GroupUUID"]);
1048 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 1048 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1049 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]); 1049 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1050 //Enum. libsecondlife.Parcel.ParcelStatus 1050 //Enum. OpenMetaverse.Parcel.ParcelStatus
1051 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 1051 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1052 newData.LandingType = (Byte) row["LandingType"]; 1052 newData.LandingType = (Byte) row["LandingType"];
1053 newData.MediaAutoScale = (Byte) row["MediaAutoScale"]; 1053 newData.MediaAutoScale = (Byte) row["MediaAutoScale"];
1054 newData.MediaID = new LLUUID((String) row["MediaTextureUUID"]); 1054 newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
1055 newData.MediaURL = (String) row["MediaURL"]; 1055 newData.MediaURL = (String) row["MediaURL"];
1056 newData.MusicURL = (String) row["MusicURL"]; 1056 newData.MusicURL = (String) row["MusicURL"];
1057 newData.PassHours = Convert.ToSingle(row["PassHours"]); 1057 newData.PassHours = Convert.ToSingle(row["PassHours"]);
@@ -1061,25 +1061,25 @@ namespace OpenSim.Data.SQLite
1061 { 1061 {
1062 1062
1063 newData.UserLocation = 1063 newData.UserLocation =
1064 new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), 1064 new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
1065 Convert.ToSingle(row["UserLocationZ"])); 1065 Convert.ToSingle(row["UserLocationZ"]));
1066 newData.UserLookAt = 1066 newData.UserLookAt =
1067 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), 1067 new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
1068 Convert.ToSingle(row["UserLookAtZ"])); 1068 Convert.ToSingle(row["UserLookAtZ"]));
1069 1069
1070 } 1070 }
1071 catch (InvalidCastException) 1071 catch (InvalidCastException)
1072 { 1072 {
1073 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 1073 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
1074 newData.UserLocation = LLVector3.Zero; 1074 newData.UserLocation = Vector3.Zero;
1075 newData.UserLookAt = LLVector3.Zero; 1075 newData.UserLookAt = Vector3.Zero;
1076 } 1076 }
1077 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); 1077 newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
1078 LLUUID authBuyerID = LLUUID.Zero; 1078 UUID authBuyerID = UUID.Zero;
1079 1079
1080 try 1080 try
1081 { 1081 {
1082 Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID); 1082 UUID.TryParse((string)row["AuthbuyerID"], out authBuyerID);
1083 } 1083 }
1084 catch (InvalidCastException) 1084 catch (InvalidCastException)
1085 { 1085 {
@@ -1120,7 +1120,7 @@ namespace OpenSim.Data.SQLite
1120 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) 1120 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
1121 { 1121 {
1122 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 1122 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1123 entry.AgentID = new LLUUID((string) row["AccessUUID"]); 1123 entry.AgentID = new UUID((string) row["AccessUUID"]);
1124 entry.Flags = (ParcelManager.AccessList) row["Flags"]; 1124 entry.Flags = (ParcelManager.AccessList) row["Flags"];
1125 entry.Time = new DateTime(); 1125 entry.Time = new DateTime();
1126 return entry; 1126 return entry;
@@ -1144,7 +1144,7 @@ namespace OpenSim.Data.SQLite
1144 return str.ToArray(); 1144 return str.ToArray();
1145 } 1145 }
1146 1146
1147// private void fillTerrainRow(DataRow row, LLUUID regionUUID, int rev, double[,] val) 1147// private void fillTerrainRow(DataRow row, UUID regionUUID, int rev, double[,] val)
1148// { 1148// {
1149// row["RegionUUID"] = regionUUID; 1149// row["RegionUUID"] = regionUUID;
1150// row["Revision"] = rev; 1150// row["Revision"] = rev;
@@ -1167,7 +1167,7 @@ namespace OpenSim.Data.SQLite
1167 /// <param name="prim"></param> 1167 /// <param name="prim"></param>
1168 /// <param name="sceneGroupID"></param> 1168 /// <param name="sceneGroupID"></param>
1169 /// <param name="regionUUID"></param> 1169 /// <param name="regionUUID"></param>
1170 private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1170 private static void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1171 { 1171 {
1172 row["UUID"] = Util.ToRawUuidString(prim.UUID); 1172 row["UUID"] = Util.ToRawUuidString(prim.UUID);
1173 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1173 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1215,12 +1215,12 @@ namespace OpenSim.Data.SQLite
1215 row["RotationW"] = prim.RotationOffset.W; 1215 row["RotationW"] = prim.RotationOffset.W;
1216 1216
1217 // Sit target 1217 // Sit target
1218 LLVector3 sitTargetPos = prim.SitTargetPositionLL; 1218 Vector3 sitTargetPos = prim.SitTargetPositionLL;
1219 row["SitTargetOffsetX"] = sitTargetPos.X; 1219 row["SitTargetOffsetX"] = sitTargetPos.X;
1220 row["SitTargetOffsetY"] = sitTargetPos.Y; 1220 row["SitTargetOffsetY"] = sitTargetPos.Y;
1221 row["SitTargetOffsetZ"] = sitTargetPos.Z; 1221 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1222 1222
1223 LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; 1223 Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
1224 row["SitTargetOrientW"] = sitTargetOrient.W; 1224 row["SitTargetOrientW"] = sitTargetOrient.W;
1225 row["SitTargetOrientX"] = sitTargetOrient.X; 1225 row["SitTargetOrientX"] = sitTargetOrient.X;
1226 row["SitTargetOrientY"] = sitTargetOrient.Y; 1226 row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1263,7 +1263,7 @@ namespace OpenSim.Data.SQLite
1263 /// <param name="row"></param> 1263 /// <param name="row"></param>
1264 /// <param name="land"></param> 1264 /// <param name="land"></param>
1265 /// <param name="regionUUID"></param> 1265 /// <param name="regionUUID"></param>
1266 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1266 private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
1267 { 1267 {
1268 row["UUID"] = Util.ToRawUuidString(land.GlobalID); 1268 row["UUID"] = Util.ToRawUuidString(land.GlobalID);
1269 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1269 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1278,12 +1278,12 @@ namespace OpenSim.Data.SQLite
1278 row["IsGroupOwned"] = land.IsGroupOwned; 1278 row["IsGroupOwned"] = land.IsGroupOwned;
1279 row["Area"] = land.Area; 1279 row["Area"] = land.Area;
1280 row["AuctionID"] = land.AuctionID; //Unemplemented 1280 row["AuctionID"] = land.AuctionID; //Unemplemented
1281 row["Category"] = land.Category; //Enum libsecondlife.Parcel.ParcelCategory 1281 row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
1282 row["ClaimDate"] = land.ClaimDate; 1282 row["ClaimDate"] = land.ClaimDate;
1283 row["ClaimPrice"] = land.ClaimPrice; 1283 row["ClaimPrice"] = land.ClaimPrice;
1284 row["GroupUUID"] = Util.ToRawUuidString(land.GroupID); 1284 row["GroupUUID"] = Util.ToRawUuidString(land.GroupID);
1285 row["SalePrice"] = land.SalePrice; 1285 row["SalePrice"] = land.SalePrice;
1286 row["LandStatus"] = land.Status; //Enum. libsecondlife.Parcel.ParcelStatus 1286 row["LandStatus"] = land.Status; //Enum. OpenMetaverse.Parcel.ParcelStatus
1287 row["LandFlags"] = land.Flags; 1287 row["LandFlags"] = land.Flags;
1288 row["LandingType"] = land.LandingType; 1288 row["LandingType"] = land.LandingType;
1289 row["MediaAutoScale"] = land.MediaAutoScale; 1289 row["MediaAutoScale"] = land.MediaAutoScale;
@@ -1308,7 +1308,7 @@ namespace OpenSim.Data.SQLite
1308 /// <param name="row"></param> 1308 /// <param name="row"></param>
1309 /// <param name="entry"></param> 1309 /// <param name="entry"></param>
1310 /// <param name="parcelID"></param> 1310 /// <param name="parcelID"></param>
1311 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) 1311 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
1312 { 1312 {
1313 row["LandUUID"] = Util.ToRawUuidString(parcelID); 1313 row["LandUUID"] = Util.ToRawUuidString(parcelID);
1314 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); 1314 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID);
@@ -1323,7 +1323,7 @@ namespace OpenSim.Data.SQLite
1323 private PrimitiveBaseShape buildShape(DataRow row) 1323 private PrimitiveBaseShape buildShape(DataRow row)
1324 { 1324 {
1325 PrimitiveBaseShape s = new PrimitiveBaseShape(); 1325 PrimitiveBaseShape s = new PrimitiveBaseShape();
1326 s.Scale = new LLVector3( 1326 s.Scale = new Vector3(
1327 Convert.ToSingle(row["ScaleX"]), 1327 Convert.ToSingle(row["ScaleX"]),
1328 Convert.ToSingle(row["ScaleY"]), 1328 Convert.ToSingle(row["ScaleY"]),
1329 Convert.ToSingle(row["ScaleZ"]) 1329 Convert.ToSingle(row["ScaleZ"])
@@ -1418,7 +1418,7 @@ namespace OpenSim.Data.SQLite
1418 /// <param name="prim"></param> 1418 /// <param name="prim"></param>
1419 /// <param name="sceneGroupID"></param> 1419 /// <param name="sceneGroupID"></param>
1420 /// <param name="regionUUID"></param> 1420 /// <param name="regionUUID"></param>
1421 private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1421 private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1422 { 1422 {
1423 DataTable prims = ds.Tables["prims"]; 1423 DataTable prims = ds.Tables["prims"];
1424 DataTable shapes = ds.Tables["primshapes"]; 1424 DataTable shapes = ds.Tables["primshapes"];
@@ -1453,7 +1453,7 @@ namespace OpenSim.Data.SQLite
1453 /// </summary> 1453 /// </summary>
1454 /// <param name="primID"></param> 1454 /// <param name="primID"></param>
1455 /// <param name="items"></param> 1455 /// <param name="items"></param>
1456 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 1456 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
1457 { 1457 {
1458 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID); 1458 m_log.InfoFormat("[REGION DB]: Entered StorePrimInventory with prim ID {0}", primID);
1459 1459
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index ae3cb72..7f1fd62 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -59,7 +59,7 @@ namespace OpenSim.Data.SQLite
59 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname"; 59 private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
60 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname"; 60 private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
61 61
62 private Dictionary<LLUUID, AvatarAppearance> aplist = new Dictionary<LLUUID, AvatarAppearance>(); 62 private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
63 private DataSet ds; 63 private DataSet ds;
64 private SqliteDataAdapter da; 64 private SqliteDataAdapter da;
65 private SqliteDataAdapter daf; 65 private SqliteDataAdapter daf;
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
124 /// </summary> 124 /// </summary>
125 /// <param name="uuid">User UUID</param> 125 /// <param name="uuid">User UUID</param>
126 /// <returns>user profile data</returns> 126 /// <returns>user profile data</returns>
127 override public UserProfileData GetUserByUUID(LLUUID uuid) 127 override public UserProfileData GetUserByUUID(UUID uuid)
128 { 128 {
129 lock (ds) 129 lock (ds)
130 { 130 {
@@ -184,21 +184,21 @@ namespace OpenSim.Data.SQLite
184 /// <param name="friendlistowner">UUID of the friendlist owner</param> 184 /// <param name="friendlistowner">UUID of the friendlist owner</param>
185 /// <param name="friend">UUID of the friend to add</param> 185 /// <param name="friend">UUID of the friend to add</param>
186 /// <param name="perms">permission flag</param> 186 /// <param name="perms">permission flag</param>
187 override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 187 override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
188 { 188 {
189 string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)"; 189 string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
190 190
191 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn)) 191 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
192 { 192 {
193 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 193 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
194 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 194 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
195 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 195 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
196 cmd.ExecuteNonQuery(); 196 cmd.ExecuteNonQuery();
197 } 197 }
198 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn)) 198 using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
199 { 199 {
200 cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.UUID.ToString())); 200 cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.ToString()));
201 cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.UUID.ToString())); 201 cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.ToString()));
202 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 202 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
203 cmd.ExecuteNonQuery(); 203 cmd.ExecuteNonQuery();
204 } 204 }
@@ -209,13 +209,13 @@ namespace OpenSim.Data.SQLite
209 /// </summary> 209 /// </summary>
210 /// <param name="friendlistowner">UUID of the friendlist owner</param> 210 /// <param name="friendlistowner">UUID of the friendlist owner</param>
211 /// <param name="friend">UUID of the friend to remove</param> 211 /// <param name="friend">UUID of the friend to remove</param>
212 override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 212 override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
213 { 213 {
214 string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)"; 214 string DeletePerms = "delete from friendlist where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
215 using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn)) 215 using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn))
216 { 216 {
217 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 217 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
218 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 218 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
219 cmd.ExecuteNonQuery(); 219 cmd.ExecuteNonQuery();
220 } 220 }
221 } 221 }
@@ -226,14 +226,14 @@ namespace OpenSim.Data.SQLite
226 /// <param name="friendlistowner">UUID of the friendlist owner</param> 226 /// <param name="friendlistowner">UUID of the friendlist owner</param>
227 /// <param name="friend">UUID of the friend to modify</param> 227 /// <param name="friend">UUID of the friend to modify</param>
228 /// <param name="perms">updated permission flag</param> 228 /// <param name="perms">updated permission flag</param>
229 override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 229 override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
230 { 230 {
231 string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID"; 231 string UpdatePerms = "update friendlist set perms=:perms where ownerID=:ownerID and friendID=:friendID";
232 using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn)) 232 using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn))
233 { 233 {
234 cmd.Parameters.Add(new SqliteParameter(":perms", perms)); 234 cmd.Parameters.Add(new SqliteParameter(":perms", perms));
235 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 235 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
236 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.UUID.ToString())); 236 cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
237 cmd.ExecuteNonQuery(); 237 cmd.ExecuteNonQuery();
238 } 238 }
239 } 239 }
@@ -243,13 +243,13 @@ namespace OpenSim.Data.SQLite
243 /// </summary> 243 /// </summary>
244 /// <param name="friendlistowner">UUID of the friendlist owner</param> 244 /// <param name="friendlistowner">UUID of the friendlist owner</param>
245 /// <returns>The friendlist list</returns> 245 /// <returns>The friendlist list</returns>
246 override public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 246 override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
247 { 247 {
248 List<FriendListItem> returnlist = new List<FriendListItem>(); 248 List<FriendListItem> returnlist = new List<FriendListItem>();
249 249
250 using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn)) 250 using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn))
251 { 251 {
252 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.UUID.ToString())); 252 cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
253 253
254 try 254 try
255 { 255 {
@@ -259,7 +259,7 @@ namespace OpenSim.Data.SQLite
259 { 259 {
260 FriendListItem user = new FriendListItem(); 260 FriendListItem user = new FriendListItem();
261 user.FriendListOwner = friendlistowner; 261 user.FriendListOwner = friendlistowner;
262 user.Friend = new LLUUID((string)reader[0]); 262 user.Friend = new UUID((string)reader[0]);
263 user.FriendPerms = Convert.ToUInt32(reader[1]); 263 user.FriendPerms = Convert.ToUInt32(reader[1]);
264 user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]); 264 user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]);
265 returnlist.Add(user); 265 returnlist.Add(user);
@@ -288,7 +288,7 @@ namespace OpenSim.Data.SQLite
288 /// <param name="regionuuid">UUID of the region</param> 288 /// <param name="regionuuid">UUID of the region</param>
289 /// <param name="regionhandle">region handle</param> 289 /// <param name="regionhandle">region handle</param>
290 /// <remarks>DO NOTHING</remarks> 290 /// <remarks>DO NOTHING</remarks>
291 override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 291 override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
292 { 292 {
293 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); 293 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
294 } 294 }
@@ -299,7 +299,7 @@ namespace OpenSim.Data.SQLite
299 /// <param name="queryID"></param> 299 /// <param name="queryID"></param>
300 /// <param name="query"></param> 300 /// <param name="query"></param>
301 /// <returns></returns> 301 /// <returns></returns>
302 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 302 override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
303 { 303 {
304 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); 304 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
305 string[] querysplit; 305 string[] querysplit;
@@ -316,7 +316,7 @@ namespace OpenSim.Data.SQLite
316 while (reader.Read()) 316 while (reader.Read())
317 { 317 {
318 AvatarPickerAvatar user = new AvatarPickerAvatar(); 318 AvatarPickerAvatar user = new AvatarPickerAvatar();
319 user.AvatarID = new LLUUID((string) reader["UUID"]); 319 user.AvatarID = new UUID((string) reader["UUID"]);
320 user.firstName = (string) reader["username"]; 320 user.firstName = (string) reader["username"];
321 user.lastName = (string) reader["surname"]; 321 user.lastName = (string) reader["surname"];
322 returnlist.Add(user); 322 returnlist.Add(user);
@@ -337,7 +337,7 @@ namespace OpenSim.Data.SQLite
337 while (reader.Read()) 337 while (reader.Read())
338 { 338 {
339 AvatarPickerAvatar user = new AvatarPickerAvatar(); 339 AvatarPickerAvatar user = new AvatarPickerAvatar();
340 user.AvatarID = new LLUUID((string) reader["UUID"]); 340 user.AvatarID = new UUID((string) reader["UUID"]);
341 user.firstName = (string) reader["username"]; 341 user.firstName = (string) reader["username"];
342 user.lastName = (string) reader["surname"]; 342 user.lastName = (string) reader["surname"];
343 returnlist.Add(user); 343 returnlist.Add(user);
@@ -354,7 +354,7 @@ namespace OpenSim.Data.SQLite
354 /// </summary> 354 /// </summary>
355 /// <param name="uuid">The user's account ID</param> 355 /// <param name="uuid">The user's account ID</param>
356 /// <returns>A matching user profile</returns> 356 /// <returns>A matching user profile</returns>
357 override public UserAgentData GetAgentByUUID(LLUUID uuid) 357 override public UserAgentData GetAgentByUUID(UUID uuid)
358 { 358 {
359 try 359 try
360 { 360 {
@@ -399,7 +399,7 @@ namespace OpenSim.Data.SQLite
399 /// </summary> 399 /// </summary>
400 /// <param name="AgentID">UUID of the user</param> 400 /// <param name="AgentID">UUID of the user</param>
401 /// <param name="WebLoginKey">UUID of the weblogin</param> 401 /// <param name="WebLoginKey">UUID of the weblogin</param>
402 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 402 override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
403 { 403 {
404 DataTable users = ds.Tables["users"]; 404 DataTable users = ds.Tables["users"];
405 lock (ds) 405 lock (ds)
@@ -520,7 +520,7 @@ namespace OpenSim.Data.SQLite
520 /// <param name="to">End account</param> 520 /// <param name="to">End account</param>
521 /// <param name="amount">The amount to move</param> 521 /// <param name="amount">The amount to move</param>
522 /// <returns>Success?</returns> 522 /// <returns>Success?</returns>
523 override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 523 override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
524 { 524 {
525 return true; 525 return true;
526 } 526 }
@@ -533,7 +533,7 @@ namespace OpenSim.Data.SQLite
533 /// <param name="to">Receivers account</param> 533 /// <param name="to">Receivers account</param>
534 /// <param name="item">Inventory item</param> 534 /// <param name="item">Inventory item</param>
535 /// <returns>Success?</returns> 535 /// <returns>Success?</returns>
536 override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 536 override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
537 { 537 {
538 return true; 538 return true;
539 } 539 }
@@ -545,7 +545,7 @@ namespace OpenSim.Data.SQLite
545 /// </summary> 545 /// </summary>
546 /// <param name="user">The user UUID</param> 546 /// <param name="user">The user UUID</param>
547 /// <returns>Avatar Appearence</returns> 547 /// <returns>Avatar Appearence</returns>
548 override public AvatarAppearance GetUserAppearance(LLUUID user) 548 override public AvatarAppearance GetUserAppearance(UUID user)
549 { 549 {
550 AvatarAppearance aa = null; 550 AvatarAppearance aa = null;
551 try { 551 try {
@@ -562,7 +562,7 @@ namespace OpenSim.Data.SQLite
562 /// </summary> 562 /// </summary>
563 /// <param name="user">the user UUID</param> 563 /// <param name="user">the user UUID</param>
564 /// <param name="appearance">appearence</param> 564 /// <param name="appearance">appearence</param>
565 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 565 override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
566 { 566 {
567 appearance.Owner = user; 567 appearance.Owner = user;
568 aplist[user] = appearance; 568 aplist[user] = appearance;
@@ -707,8 +707,8 @@ namespace OpenSim.Data.SQLite
707 private static UserProfileData buildUserProfile(DataRow row) 707 private static UserProfileData buildUserProfile(DataRow row)
708 { 708 {
709 UserProfileData user = new UserProfileData(); 709 UserProfileData user = new UserProfileData();
710 LLUUID tmp; 710 UUID tmp;
711 LLUUID.TryParse((String)row["UUID"], out tmp); 711 UUID.TryParse((String)row["UUID"], out tmp);
712 user.ID = tmp; 712 user.ID = tmp;
713 user.FirstName = (String) row["username"]; 713 user.FirstName = (String) row["username"];
714 user.SurName = (String) row["surname"]; 714 user.SurName = (String) row["surname"];
@@ -717,39 +717,39 @@ namespace OpenSim.Data.SQLite
717 717
718 user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]); 718 user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]);
719 user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]); 719 user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]);
720 user.HomeLocation = new LLVector3( 720 user.HomeLocation = new Vector3(
721 Convert.ToSingle(row["homeLocationX"]), 721 Convert.ToSingle(row["homeLocationX"]),
722 Convert.ToSingle(row["homeLocationY"]), 722 Convert.ToSingle(row["homeLocationY"]),
723 Convert.ToSingle(row["homeLocationZ"]) 723 Convert.ToSingle(row["homeLocationZ"])
724 ); 724 );
725 user.HomeLookAt = new LLVector3( 725 user.HomeLookAt = new Vector3(
726 Convert.ToSingle(row["homeLookAtX"]), 726 Convert.ToSingle(row["homeLookAtX"]),
727 Convert.ToSingle(row["homeLookAtY"]), 727 Convert.ToSingle(row["homeLookAtY"]),
728 Convert.ToSingle(row["homeLookAtZ"]) 728 Convert.ToSingle(row["homeLookAtZ"])
729 ); 729 );
730 730
731 LLUUID regionID = LLUUID.Zero; 731 UUID regionID = UUID.Zero;
732 LLUUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero 732 UUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
733 user.HomeRegionID = regionID; 733 user.HomeRegionID = regionID;
734 734
735 user.Created = Convert.ToInt32(row["created"]); 735 user.Created = Convert.ToInt32(row["created"]);
736 user.LastLogin = Convert.ToInt32(row["lastLogin"]); 736 user.LastLogin = Convert.ToInt32(row["lastLogin"]);
737 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); 737 user.RootInventoryFolderID = new UUID((String) row["rootInventoryFolderID"]);
738 user.UserInventoryURI = (String) row["userInventoryURI"]; 738 user.UserInventoryURI = (String) row["userInventoryURI"];
739 user.UserAssetURI = (String) row["userAssetURI"]; 739 user.UserAssetURI = (String) row["userAssetURI"];
740 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); 740 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
741 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); 741 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
742 user.AboutText = (String) row["profileAboutText"]; 742 user.AboutText = (String) row["profileAboutText"];
743 user.FirstLifeAboutText = (String) row["profileFirstText"]; 743 user.FirstLifeAboutText = (String) row["profileFirstText"];
744 LLUUID.TryParse((String)row["profileImage"], out tmp); 744 UUID.TryParse((String)row["profileImage"], out tmp);
745 user.Image = tmp; 745 user.Image = tmp;
746 LLUUID.TryParse((String)row["profileFirstImage"], out tmp); 746 UUID.TryParse((String)row["profileFirstImage"], out tmp);
747 user.FirstLifeImage = tmp; 747 user.FirstLifeImage = tmp;
748 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]); 748 user.WebLoginKey = new UUID((String) row["webLoginKey"]);
749 user.UserFlags = Convert.ToInt32(row["userFlags"]); 749 user.UserFlags = Convert.ToInt32(row["userFlags"]);
750 user.GodLevel = Convert.ToInt32(row["godLevel"]); 750 user.GodLevel = Convert.ToInt32(row["godLevel"]);
751 user.CustomType = row["customType"].ToString(); 751 user.CustomType = row["customType"].ToString();
752 user.Partner = new LLUUID((String) row["partner"]); 752 user.Partner = new UUID((String) row["partner"]);
753 753
754 return user; 754 return user;
755 } 755 }
@@ -814,18 +814,18 @@ namespace OpenSim.Data.SQLite
814 { 814 {
815 UserAgentData ua = new UserAgentData(); 815 UserAgentData ua = new UserAgentData();
816 816
817 ua.ProfileID = new LLUUID((String) row["UUID"]); 817 ua.ProfileID = new UUID((String) row["UUID"]);
818 ua.AgentIP = (String) row["agentIP"]; 818 ua.AgentIP = (String) row["agentIP"];
819 ua.AgentPort = Convert.ToUInt32(row["agentPort"]); 819 ua.AgentPort = Convert.ToUInt32(row["agentPort"]);
820 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]); 820 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
821 ua.SessionID = new LLUUID((String) row["sessionID"]); 821 ua.SessionID = new UUID((String) row["sessionID"]);
822 ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]); 822 ua.SecureSessionID = new UUID((String) row["secureSessionID"]);
823 ua.InitialRegion = new LLUUID((String) row["regionID"]); 823 ua.InitialRegion = new UUID((String) row["regionID"]);
824 ua.LoginTime = Convert.ToInt32(row["loginTime"]); 824 ua.LoginTime = Convert.ToInt32(row["loginTime"]);
825 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]); 825 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
826 ua.Region = new LLUUID((String) row["currentRegion"]); 826 ua.Region = new UUID((String) row["currentRegion"]);
827 ua.Handle = Convert.ToUInt64(row["currentHandle"]); 827 ua.Handle = Convert.ToUInt64(row["currentHandle"]);
828 ua.Position = new LLVector3( 828 ua.Position = new Vector3(
829 Convert.ToSingle(row["currentPosX"]), 829 Convert.ToSingle(row["currentPosX"]),
830 Convert.ToSingle(row["currentPosY"]), 830 Convert.ToSingle(row["currentPosY"]),
831 Convert.ToSingle(row["currentPosZ"]) 831 Convert.ToSingle(row["currentPosZ"])
@@ -906,7 +906,7 @@ namespace OpenSim.Data.SQLite
906 906
907 } 907 }
908 908
909 override public void ResetAttachments(LLUUID userID) 909 override public void ResetAttachments(UUID userID)
910 { 910 {
911 } 911 }
912 } 912 }