aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs26
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs12
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs54
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs134
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs138
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs62
8 files changed, 217 insertions, 217 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 08a8c6e..5c58a4b 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.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 MySql.Data.MySqlClient; 34using MySql.Data.MySqlClient;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -116,7 +116,7 @@ namespace OpenSim.Data.MySQL
116 /// <param name="assetID">Asset UUID to fetch</param> 116 /// <param name="assetID">Asset UUID to fetch</param>
117 /// <returns>Return the asset</returns> 117 /// <returns>Return the asset</returns>
118 /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks> 118 /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
119 override public AssetBase FetchAsset(LLUUID assetID) 119 override public AssetBase FetchAsset(UUID assetID)
120 { 120 {
121 AssetBase asset = null; 121 AssetBase asset = null;
122 lock (_dbConnection) 122 lock (_dbConnection)
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MySQL
223 /// </summary> 223 /// </summary>
224 /// <param name="uuid">The asset UUID</param> 224 /// <param name="uuid">The asset UUID</param>
225 /// <returns>true if exist.</returns> 225 /// <returns>true if exist.</returns>
226 override public bool ExistsAsset(LLUUID uuid) 226 override public bool ExistsAsset(UUID uuid)
227 { 227 {
228 bool assetExists = false; 228 bool assetExists = false;
229 229
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 2ab7d40..8eddec6 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.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 MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MySQL
157 m_lastConnectionUse = timeNow; 157 m_lastConnectionUse = timeNow;
158 } 158 }
159 159
160 public EstateSettings LoadEstateSettings(LLUUID regionID) 160 public EstateSettings LoadEstateSettings(UUID regionID)
161 { 161 {
162 EstateSettings es = new EstateSettings(); 162 EstateSettings es = new EstateSettings();
163 es.OnSave += StoreEstateSettings; 163 es.OnSave += StoreEstateSettings;
@@ -185,11 +185,11 @@ namespace OpenSim.Data.MySQL
185 else 185 else
186 m_FieldMap[name].SetValue(es, false); 186 m_FieldMap[name].SetValue(es, false);
187 } 187 }
188 else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) 188 else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
189 { 189 {
190 LLUUID uuid = LLUUID.Zero; 190 UUID uuid = UUID.Zero;
191 191
192 LLUUID.TryParse(r[name].ToString(), out uuid); 192 UUID.TryParse(r[name].ToString(), out uuid);
193 m_FieldMap[name].SetValue(es, uuid); 193 m_FieldMap[name].SetValue(es, uuid);
194 } 194 }
195 else 195 else
@@ -330,8 +330,8 @@ namespace OpenSim.Data.MySQL
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["bannedUUID"].ToString(), out uuid); 334 UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
335 335
336 eb.bannedUUID = uuid; 336 eb.bannedUUID = uuid;
337 eb.bannedIP = "0.0.0.0"; 337 eb.bannedIP = "0.0.0.0";
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
366 } 366 }
367 } 367 }
368 368
369 void SaveUUIDList(uint EstateID, string table, LLUUID[] data) 369 void SaveUUIDList(uint EstateID, string table, UUID[] data)
370 { 370 {
371 CheckConnection(); 371 CheckConnection();
372 372
@@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL
381 381
382 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )"; 382 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )";
383 383
384 foreach (LLUUID uuid in data) 384 foreach (UUID uuid in data)
385 { 385 {
386 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString()); 386 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
387 cmd.Parameters.AddWithValue("?uuid", uuid.ToString()); 387 cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
@@ -391,9 +391,9 @@ namespace OpenSim.Data.MySQL
391 } 391 }
392 } 392 }
393 393
394 LLUUID[] LoadUUIDList(uint EstateID, string table) 394 UUID[] LoadUUIDList(uint EstateID, string table)
395 { 395 {
396 List<LLUUID> uuids = new List<LLUUID>(); 396 List<UUID> uuids = new List<UUID>();
397 397
398 CheckConnection(); 398 CheckConnection();
399 399
@@ -408,8 +408,8 @@ namespace OpenSim.Data.MySQL
408 { 408 {
409 // EstateBan eb = new EstateBan(); 409 // EstateBan eb = new EstateBan();
410 410
411 LLUUID uuid = new LLUUID(); 411 UUID uuid = new UUID();
412 LLUUID.TryParse(r["uuid"].ToString(), out uuid); 412 UUID.TryParse(r["uuid"].ToString(), out uuid);
413 413
414 uuids.Add(uuid); 414 uuids.Add(uuid);
415 } 415 }
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 9dc3d18..fa5b33c 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.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 OpenSim.Framework; 34using OpenSim.Framework;
35 35
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL
121 } 121 }
122 else 122 else
123 { 123 {
124 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); 124 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead");
125 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); 125 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
126 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); 126 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
127 string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); 127 string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
@@ -322,7 +322,7 @@ namespace OpenSim.Data.MySQL
322 /// </summary> 322 /// </summary>
323 /// <param name="uuid">The region UUID</param> 323 /// <param name="uuid">The region UUID</param>
324 /// <returns>The sim profile</returns> 324 /// <returns>The sim profile</returns>
325 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 325 override public RegionProfileData GetProfileByUUID(UUID uuid)
326 { 326 {
327 MySQLSuperManager dbm = GetLockedConnection(); 327 MySQLSuperManager dbm = GetLockedConnection();
328 328
@@ -458,14 +458,14 @@ namespace OpenSim.Data.MySQL
458 /// <param name="handle">The attempted regionHandle of the challenger</param> 458 /// <param name="handle">The attempted regionHandle of the challenger</param>
459 /// <param name="authkey">The secret</param> 459 /// <param name="authkey">The secret</param>
460 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 460 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
461 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 461 override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
462 { 462 {
463 bool throwHissyFit = false; // Should be true by 1.0 463 bool throwHissyFit = false; // Should be true by 1.0
464 464
465 if (throwHissyFit) 465 if (throwHissyFit)
466 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 466 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
467 467
468 RegionProfileData data = GetProfileByLLUUID(uuid); 468 RegionProfileData data = GetProfileByUUID(uuid);
469 469
470 return (handle == data.regionHandle && authkey == data.regionSecret); 470 return (handle == data.regionHandle && authkey == data.regionSecret);
471 } 471 }
@@ -479,7 +479,7 @@ namespace OpenSim.Data.MySQL
479 /// <param name="authhash"></param> 479 /// <param name="authhash"></param>
480 /// <param name="challenge"></param> 480 /// <param name="challenge"></param>
481 /// <returns></returns> 481 /// <returns></returns>
482 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 482 public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
483 { 483 {
484 // SHA512Managed HashProvider = new SHA512Managed(); 484 // SHA512Managed HashProvider = new SHA512Managed();
485 // Encoding TextProvider = new UTF8Encoding(); 485 // Encoding TextProvider = new UTF8Encoding();
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index fe2d393..50d3cc7 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
34using OpenSim.Framework; 34using OpenSim.Framework;
@@ -125,7 +125,7 @@ namespace OpenSim.Data.MySQL
125 /// </summary> 125 /// </summary>
126 /// <param name="folderID">The folder to search</param> 126 /// <param name="folderID">The folder to search</param>
127 /// <returns>A list containing inventory items</returns> 127 /// <returns>A list containing inventory items</returns>
128 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 128 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
129 { 129 {
130 try 130 try
131 { 131 {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.MySQL
163 /// </summary> 163 /// </summary>
164 /// <param name="user">The user whos inventory is to be searched</param> 164 /// <param name="user">The user whos inventory is to be searched</param>
165 /// <returns>A list of folder objects</returns> 165 /// <returns>A list of folder objects</returns>
166 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 166 public List<InventoryFolderBase> getUserRootFolders(UUID user)
167 { 167 {
168 try 168 try
169 { 169 {
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MySQL
176 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", 176 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
177 database.Connection); 177 database.Connection);
178 result.Parameters.AddWithValue("?uuid", user.ToString()); 178 result.Parameters.AddWithValue("?uuid", user.ToString());
179 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString()); 179 result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
180 MySqlDataReader reader = result.ExecuteReader(); 180 MySqlDataReader reader = result.ExecuteReader();
181 181
182 List<InventoryFolderBase> items = new List<InventoryFolderBase>(); 182 List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL
204 /// </summary> 204 /// </summary>
205 /// <param name="user">The user UUID</param> 205 /// <param name="user">The user UUID</param>
206 /// <returns></returns> 206 /// <returns></returns>
207 public InventoryFolderBase getUserRootFolder(LLUUID user) 207 public InventoryFolderBase getUserRootFolder(UUID user)
208 { 208 {
209 try 209 try
210 { 210 {
@@ -217,7 +217,7 @@ namespace OpenSim.Data.MySQL
217 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", 217 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
218 database.Connection); 218 database.Connection);
219 result.Parameters.AddWithValue("?uuid", user.ToString()); 219 result.Parameters.AddWithValue("?uuid", user.ToString());
220 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString()); 220 result.Parameters.AddWithValue("?zero", UUID.Zero.ToString());
221 221
222 MySqlDataReader reader = result.ExecuteReader(); 222 MySqlDataReader reader = result.ExecuteReader();
223 223
@@ -258,7 +258,7 @@ namespace OpenSim.Data.MySQL
258 /// </summary> 258 /// </summary>
259 /// <param name="parentID">The folder to search</param> 259 /// <param name="parentID">The folder to search</param>
260 /// <returns>A list of inventory folders</returns> 260 /// <returns>A list of inventory folders</returns>
261 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 261 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
262 { 262 {
263 try 263 try
264 { 264 {
@@ -302,23 +302,23 @@ namespace OpenSim.Data.MySQL
302 { 302 {
303 InventoryItemBase item = new InventoryItemBase(); 303 InventoryItemBase item = new InventoryItemBase();
304 304
305 item.ID = new LLUUID((string) reader["inventoryID"]); 305 item.ID = new UUID((string) reader["inventoryID"]);
306 item.AssetID = new LLUUID((string) reader["assetID"]); 306 item.AssetID = new UUID((string) reader["assetID"]);
307 item.AssetType = (int) reader["assetType"]; 307 item.AssetType = (int) reader["assetType"];
308 item.Folder = new LLUUID((string) reader["parentFolderID"]); 308 item.Folder = new UUID((string) reader["parentFolderID"]);
309 item.Owner = new LLUUID((string) reader["avatarID"]); 309 item.Owner = new UUID((string) reader["avatarID"]);
310 item.Name = (string) reader["inventoryName"]; 310 item.Name = (string) reader["inventoryName"];
311 item.Description = (string) reader["inventoryDescription"]; 311 item.Description = (string) reader["inventoryDescription"];
312 item.NextPermissions = (uint) reader["inventoryNextPermissions"]; 312 item.NextPermissions = (uint) reader["inventoryNextPermissions"];
313 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"]; 313 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"];
314 item.InvType = (int) reader["invType"]; 314 item.InvType = (int) reader["invType"];
315 item.Creator = new LLUUID((string) reader["creatorID"]); 315 item.Creator = new UUID((string) reader["creatorID"]);
316 item.BasePermissions = (uint) reader["inventoryBasePermissions"]; 316 item.BasePermissions = (uint) reader["inventoryBasePermissions"];
317 item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"]; 317 item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"];
318 item.SalePrice = (int) reader["salePrice"]; 318 item.SalePrice = (int) reader["salePrice"];
319 item.SaleType = Convert.ToByte(reader["saleType"]); 319 item.SaleType = Convert.ToByte(reader["saleType"]);
320 item.CreationDate = (int) reader["creationDate"]; 320 item.CreationDate = (int) reader["creationDate"];
321 item.GroupID = new LLUUID(reader["groupID"].ToString()); 321 item.GroupID = new UUID(reader["groupID"].ToString());
322 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); 322 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
323 item.Flags = (uint) reader["flags"]; 323 item.Flags = (uint) reader["flags"];
324 324
@@ -337,7 +337,7 @@ namespace OpenSim.Data.MySQL
337 /// </summary> 337 /// </summary>
338 /// <param name="item">The item to return</param> 338 /// <param name="item">The item to return</param>
339 /// <returns>An inventory item</returns> 339 /// <returns>An inventory item</returns>
340 public InventoryItemBase getInventoryItem(LLUUID itemID) 340 public InventoryItemBase getInventoryItem(UUID itemID)
341 { 341 {
342 try 342 try
343 { 343 {
@@ -378,9 +378,9 @@ namespace OpenSim.Data.MySQL
378 try 378 try
379 { 379 {
380 InventoryFolderBase folder = new InventoryFolderBase(); 380 InventoryFolderBase folder = new InventoryFolderBase();
381 folder.Owner = new LLUUID((string) reader["agentID"]); 381 folder.Owner = new UUID((string) reader["agentID"]);
382 folder.ParentID = new LLUUID((string) reader["parentFolderID"]); 382 folder.ParentID = new UUID((string) reader["parentFolderID"]);
383 folder.ID = new LLUUID((string) reader["folderID"]); 383 folder.ID = new UUID((string) reader["folderID"]);
384 folder.Name = (string) reader["folderName"]; 384 folder.Name = (string) reader["folderName"];
385 folder.Type = (short) reader["type"]; 385 folder.Type = (short) reader["type"];
386 folder.Version = (ushort) ((int) reader["version"]); 386 folder.Version = (ushort) ((int) reader["version"]);
@@ -400,7 +400,7 @@ namespace OpenSim.Data.MySQL
400 /// </summary> 400 /// </summary>
401 /// <param name="folder">The folder to return</param> 401 /// <param name="folder">The folder to return</param>
402 /// <returns>A folder class</returns> 402 /// <returns>A folder class</returns>
403 public InventoryFolderBase getInventoryFolder(LLUUID folderID) 403 public InventoryFolderBase getInventoryFolder(UUID folderID)
404 { 404 {
405 try 405 try
406 { 406 {
@@ -498,7 +498,7 @@ namespace OpenSim.Data.MySQL
498 /// Detele the specified inventory item 498 /// Detele the specified inventory item
499 /// </summary> 499 /// </summary>
500 /// <param name="item">The inventory item UUID to delete</param> 500 /// <param name="item">The inventory item UUID to delete</param>
501 public void deleteInventoryItem(LLUUID itemID) 501 public void deleteInventoryItem(UUID itemID)
502 { 502 {
503 try 503 try
504 { 504 {
@@ -596,7 +596,7 @@ namespace OpenSim.Data.MySQL
596 /// </summary> 596 /// </summary>
597 /// <param name="folders">list where folders will be appended</param> 597 /// <param name="folders">list where folders will be appended</param>
598 /// <param name="parentID">ID of parent</param> 598 /// <param name="parentID">ID of parent</param>
599 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 599 protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
600 { 600 {
601 List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID); 601 List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID);
602 602
@@ -610,7 +610,7 @@ namespace OpenSim.Data.MySQL
610 /// </summary> 610 /// </summary>
611 /// <param name="parentID"></param> 611 /// <param name="parentID"></param>
612 /// <returns></returns> 612 /// <returns></returns>
613 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 613 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
614 { 614 {
615 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one 615 /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
616 * - We will only need to hit the database twice instead of n times. 616 * - We will only need to hit the database twice instead of n times.
@@ -631,8 +631,8 @@ namespace OpenSim.Data.MySQL
631 try 631 try
632 { 632 {
633 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 633 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
634 Dictionary<LLUUID, List<InventoryFolderBase>> hashtable 634 Dictionary<UUID, List<InventoryFolderBase>> hashtable
635 = new Dictionary<LLUUID, List<InventoryFolderBase>>(); ; 635 = new Dictionary<UUID, List<InventoryFolderBase>>(); ;
636 List<InventoryFolderBase> parentFolder = new List<InventoryFolderBase>(); 636 List<InventoryFolderBase> parentFolder = new List<InventoryFolderBase>();
637 lock (database) 637 lock (database)
638 { 638 {
@@ -655,7 +655,7 @@ namespace OpenSim.Data.MySQL
655 655
656 if (parentFolder.Count >= 1) // No result means parent folder does not exist 656 if (parentFolder.Count >= 1) // No result means parent folder does not exist
657 { 657 {
658 if (parentFolder[0].ParentID == LLUUID.Zero) // We are querying the root folder 658 if (parentFolder[0].ParentID == UUID.Zero) // We are querying the root folder
659 { 659 {
660 /* Get all of the agent's folders from the database, put them in a list and return it */ 660 /* Get all of the agent's folders from the database, put them in a list and return it */
661 result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid", 661 result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE agentID = ?uuid",
@@ -728,7 +728,7 @@ namespace OpenSim.Data.MySQL
728 /// Delete a folder from database 728 /// Delete a folder from database
729 /// </summary> 729 /// </summary>
730 /// <param name="folderID">the folder UUID</param> 730 /// <param name="folderID">the folder UUID</param>
731 protected void deleteOneFolder(LLUUID folderID) 731 protected void deleteOneFolder(UUID folderID)
732 { 732 {
733 try 733 try
734 { 734 {
@@ -754,7 +754,7 @@ namespace OpenSim.Data.MySQL
754 /// Delete all item in a folder 754 /// Delete all item in a folder
755 /// </summary> 755 /// </summary>
756 /// <param name="folderID">the folder UUID</param> 756 /// <param name="folderID">the folder UUID</param>
757 protected void deleteItemsInFolder(LLUUID folderID) 757 protected void deleteItemsInFolder(UUID folderID)
758 { 758 {
759 try 759 try
760 { 760 {
@@ -780,7 +780,7 @@ namespace OpenSim.Data.MySQL
780 /// Deletes an inventory folder 780 /// Deletes an inventory folder
781 /// </summary> 781 /// </summary>
782 /// <param name="folderId">Id of folder to delete</param> 782 /// <param name="folderId">Id of folder to delete</param>
783 public void deleteInventoryFolder(LLUUID folderID) 783 public void deleteInventoryFolder(UUID folderID)
784 { 784 {
785 List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID); 785 List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
786 786
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index c02016c..07ef916 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL
63 } 63 }
64 else 64 else
65 { 65 {
66 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); 66 m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead");
67 67
68 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); 68 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
69 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); 69 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index e863216..6048f93 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -31,7 +31,7 @@ using System.Collections;
31using System.Data; 31using System.Data;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -384,8 +384,8 @@ namespace OpenSim.Data.MySQL
384 { 384 {
385 retval.regionHandle = tmp64; 385 retval.regionHandle = tmp64;
386 } 386 }
387 LLUUID tmp_uuid; 387 UUID tmp_uuid;
388 if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid)) 388 if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
389 { 389 {
390 return null; 390 return null;
391 } 391 }
@@ -396,7 +396,7 @@ namespace OpenSim.Data.MySQL
396 396
397 // non-critical parts 397 // non-critical parts
398 retval.regionName = (string)reader["regionName"]; 398 retval.regionName = (string)reader["regionName"];
399 retval.originUUID = new LLUUID((string) reader["originUUID"]); 399 retval.originUUID = new UUID((string) reader["originUUID"]);
400 400
401 // Secrets 401 // Secrets
402 retval.regionRecvKey = (string) reader["regionRecvKey"]; 402 retval.regionRecvKey = (string) reader["regionRecvKey"];
@@ -434,8 +434,8 @@ namespace OpenSim.Data.MySQL
434 retval.regionUserSendKey = (string) reader["regionUserSendKey"]; 434 retval.regionUserSendKey = (string) reader["regionUserSendKey"];
435 435
436 // World Map Addition 436 // World Map Addition
437 LLUUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); 437 UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
438 LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); 438 UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
439 } 439 }
440 else 440 else
441 { 441 {
@@ -463,8 +463,8 @@ namespace OpenSim.Data.MySQL
463 retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString()); 463 retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
464 retval.reservationName = (string) reader["resName"]; 464 retval.reservationName = (string) reader["resName"];
465 retval.status = Convert.ToInt32(reader["status"].ToString()) == 1; 465 retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
466 LLUUID tmp; 466 UUID tmp;
467 LLUUID.TryParse((string) reader["userUUID"], out tmp); 467 UUID.TryParse((string) reader["userUUID"], out tmp);
468 retval.userUUID = tmp; 468 retval.userUUID = tmp;
469 } 469 }
470 else 470 else
@@ -486,15 +486,15 @@ namespace OpenSim.Data.MySQL
486 if (reader.Read()) 486 if (reader.Read())
487 { 487 {
488 // Agent IDs 488 // Agent IDs
489 LLUUID tmp; 489 UUID tmp;
490 if (!LLUUID.TryParse((string)reader["UUID"], out tmp)) 490 if (!UUID.TryParse((string)reader["UUID"], out tmp))
491 return null; 491 return null;
492 retval.ProfileID = tmp; 492 retval.ProfileID = tmp;
493 493
494 LLUUID.TryParse((string) reader["sessionID"], out tmp); 494 UUID.TryParse((string) reader["sessionID"], out tmp);
495 retval.SessionID = tmp; 495 retval.SessionID = tmp;
496 496
497 LLUUID.TryParse((string)reader["secureSessionID"], out tmp); 497 UUID.TryParse((string)reader["secureSessionID"], out tmp);
498 retval.SecureSessionID = tmp; 498 retval.SecureSessionID = tmp;
499 499
500 // Agent Who? 500 // Agent Who?
@@ -507,10 +507,10 @@ namespace OpenSim.Data.MySQL
507 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString()); 507 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
508 508
509 // Current position 509 // Current position
510 retval.Region = new LLUUID((string)reader["currentRegion"]); 510 retval.Region = new UUID((string)reader["currentRegion"]);
511 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString()); 511 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
512 LLVector3 tmp_v; 512 Vector3 tmp_v;
513 LLVector3.TryParse((string) reader["currentPos"], out tmp_v); 513 Vector3.TryParse((string) reader["currentPos"], out tmp_v);
514 retval.Position = tmp_v; 514 retval.Position = tmp_v;
515 } 515 }
516 else 516 else
@@ -531,8 +531,8 @@ namespace OpenSim.Data.MySQL
531 531
532 if (reader.Read()) 532 if (reader.Read())
533 { 533 {
534 LLUUID id; 534 UUID id;
535 if (!LLUUID.TryParse((string)reader["UUID"], out id)) 535 if (!UUID.TryParse((string)reader["UUID"], out id))
536 return null; 536 return null;
537 537
538 retval.ID = id; 538 retval.ID = id;
@@ -543,17 +543,17 @@ namespace OpenSim.Data.MySQL
543 retval.PasswordSalt = (string) reader["passwordSalt"]; 543 retval.PasswordSalt = (string) reader["passwordSalt"];
544 544
545 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 545 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
546 retval.HomeLocation = new LLVector3( 546 retval.HomeLocation = new Vector3(
547 Convert.ToSingle(reader["homeLocationX"].ToString()), 547 Convert.ToSingle(reader["homeLocationX"].ToString()),
548 Convert.ToSingle(reader["homeLocationY"].ToString()), 548 Convert.ToSingle(reader["homeLocationY"].ToString()),
549 Convert.ToSingle(reader["homeLocationZ"].ToString())); 549 Convert.ToSingle(reader["homeLocationZ"].ToString()));
550 retval.HomeLookAt = new LLVector3( 550 retval.HomeLookAt = new Vector3(
551 Convert.ToSingle(reader["homeLookAtX"].ToString()), 551 Convert.ToSingle(reader["homeLookAtX"].ToString()),
552 Convert.ToSingle(reader["homeLookAtY"].ToString()), 552 Convert.ToSingle(reader["homeLookAtY"].ToString()),
553 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 553 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
554 554
555 LLUUID regionID = LLUUID.Zero; 555 UUID regionID = UUID.Zero;
556 LLUUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero 556 UUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
557 retval.HomeRegionID = regionID; 557 retval.HomeRegionID = regionID;
558 558
559 retval.Created = Convert.ToInt32(reader["created"].ToString()); 559 retval.Created = Convert.ToInt32(reader["created"].ToString());
@@ -576,29 +576,29 @@ namespace OpenSim.Data.MySQL
576 retval.FirstLifeAboutText = (string)reader["profileFirstText"]; 576 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
577 577
578 if (reader.IsDBNull(reader.GetOrdinal("profileImage"))) 578 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
579 retval.Image = LLUUID.Zero; 579 retval.Image = UUID.Zero;
580 else { 580 else {
581 LLUUID tmp; 581 UUID tmp;
582 LLUUID.TryParse((string)reader["profileImage"], out tmp); 582 UUID.TryParse((string)reader["profileImage"], out tmp);
583 retval.Image = tmp; 583 retval.Image = tmp;
584 } 584 }
585 585
586 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage"))) 586 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
587 retval.FirstLifeImage = LLUUID.Zero; 587 retval.FirstLifeImage = UUID.Zero;
588 else { 588 else {
589 LLUUID tmp; 589 UUID tmp;
590 LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); 590 UUID.TryParse((string)reader["profileFirstImage"], out tmp);
591 retval.FirstLifeImage = tmp; 591 retval.FirstLifeImage = tmp;
592 } 592 }
593 593
594 if (reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) 594 if (reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
595 { 595 {
596 retval.WebLoginKey = LLUUID.Zero; 596 retval.WebLoginKey = UUID.Zero;
597 } 597 }
598 else 598 else
599 { 599 {
600 LLUUID tmp; 600 UUID tmp;
601 LLUUID.TryParse((string)reader["webLoginKey"], out tmp); 601 UUID.TryParse((string)reader["webLoginKey"], out tmp);
602 retval.WebLoginKey = tmp; 602 retval.WebLoginKey = tmp;
603 } 603 }
604 604
@@ -611,12 +611,12 @@ namespace OpenSim.Data.MySQL
611 611
612 if (reader.IsDBNull(reader.GetOrdinal("partner"))) 612 if (reader.IsDBNull(reader.GetOrdinal("partner")))
613 { 613 {
614 retval.Partner = LLUUID.Zero; 614 retval.Partner = UUID.Zero;
615 } 615 }
616 else 616 else
617 { 617 {
618 LLUUID tmp; 618 UUID tmp;
619 LLUUID.TryParse((string)reader["partner"], out tmp); 619 UUID.TryParse((string)reader["partner"], out tmp);
620 retval.Partner = tmp; 620 retval.Partner = tmp;
621 } 621 }
622 } 622 }
@@ -638,37 +638,37 @@ namespace OpenSim.Data.MySQL
638 if (reader.Read()) 638 if (reader.Read())
639 { 639 {
640 appearance = new AvatarAppearance(); 640 appearance = new AvatarAppearance();
641 appearance.Owner = new LLUUID((string)reader["owner"]); 641 appearance.Owner = new UUID((string)reader["owner"]);
642 appearance.Serial = Convert.ToInt32(reader["serial"]); 642 appearance.Serial = Convert.ToInt32(reader["serial"]);
643 appearance.VisualParams = (byte[])reader["visual_params"]; 643 appearance.VisualParams = (byte[])reader["visual_params"];
644 appearance.Texture = new LLObject.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length); 644 appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
645 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]); 645 appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
646 appearance.BodyItem = new LLUUID((string)reader["body_item"]); 646 appearance.BodyItem = new UUID((string)reader["body_item"]);
647 appearance.BodyAsset = new LLUUID((string)reader["body_asset"]); 647 appearance.BodyAsset = new UUID((string)reader["body_asset"]);
648 appearance.SkinItem = new LLUUID((string)reader["skin_item"]); 648 appearance.SkinItem = new UUID((string)reader["skin_item"]);
649 appearance.SkinAsset = new LLUUID((string)reader["skin_asset"]); 649 appearance.SkinAsset = new UUID((string)reader["skin_asset"]);
650 appearance.HairItem = new LLUUID((string)reader["hair_item"]); 650 appearance.HairItem = new UUID((string)reader["hair_item"]);
651 appearance.HairAsset = new LLUUID((string)reader["hair_asset"]); 651 appearance.HairAsset = new UUID((string)reader["hair_asset"]);
652 appearance.EyesItem = new LLUUID((string)reader["eyes_item"]); 652 appearance.EyesItem = new UUID((string)reader["eyes_item"]);
653 appearance.EyesAsset = new LLUUID((string)reader["eyes_asset"]); 653 appearance.EyesAsset = new UUID((string)reader["eyes_asset"]);
654 appearance.ShirtItem = new LLUUID((string)reader["shirt_item"]); 654 appearance.ShirtItem = new UUID((string)reader["shirt_item"]);
655 appearance.ShirtAsset = new LLUUID((string)reader["shirt_asset"]); 655 appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]);
656 appearance.PantsItem = new LLUUID((string)reader["pants_item"]); 656 appearance.PantsItem = new UUID((string)reader["pants_item"]);
657 appearance.PantsAsset = new LLUUID((string)reader["pants_asset"]); 657 appearance.PantsAsset = new UUID((string)reader["pants_asset"]);
658 appearance.ShoesItem = new LLUUID((string)reader["shoes_item"]); 658 appearance.ShoesItem = new UUID((string)reader["shoes_item"]);
659 appearance.ShoesAsset = new LLUUID((string)reader["shoes_asset"]); 659 appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]);
660 appearance.SocksItem = new LLUUID((string)reader["socks_item"]); 660 appearance.SocksItem = new UUID((string)reader["socks_item"]);
661 appearance.SocksAsset = new LLUUID((string)reader["socks_asset"]); 661 appearance.SocksAsset = new UUID((string)reader["socks_asset"]);
662 appearance.JacketItem = new LLUUID((string)reader["jacket_item"]); 662 appearance.JacketItem = new UUID((string)reader["jacket_item"]);
663 appearance.JacketAsset = new LLUUID((string)reader["jacket_asset"]); 663 appearance.JacketAsset = new UUID((string)reader["jacket_asset"]);
664 appearance.GlovesItem = new LLUUID((string)reader["gloves_item"]); 664 appearance.GlovesItem = new UUID((string)reader["gloves_item"]);
665 appearance.GlovesAsset = new LLUUID((string)reader["gloves_asset"]); 665 appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]);
666 appearance.UnderShirtItem = new LLUUID((string)reader["undershirt_item"]); 666 appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]);
667 appearance.UnderShirtAsset = new LLUUID((string)reader["undershirt_asset"]); 667 appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]);
668 appearance.UnderPantsItem = new LLUUID((string)reader["underpants_item"]); 668 appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]);
669 appearance.UnderPantsAsset = new LLUUID((string)reader["underpants_asset"]); 669 appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]);
670 appearance.SkirtItem = new LLUUID((string)reader["skirt_item"]); 670 appearance.SkirtItem = new UUID((string)reader["skirt_item"]);
671 appearance.SkirtAsset = new LLUUID((string)reader["skirt_asset"]); 671 appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]);
672 } 672 }
673 return appearance; 673 return appearance;
674 } 674 }
@@ -766,12 +766,12 @@ namespace OpenSim.Data.MySQL
766 /// <param name="firstImage">UUID for firstlife image</param> 766 /// <param name="firstImage">UUID for firstlife image</param>
767 /// <param name="webLoginKey">Ignored</param> 767 /// <param name="webLoginKey">Ignored</param>
768 /// <returns>Success?</returns> 768 /// <returns>Success?</returns>
769 public bool insertUserRow(LLUUID uuid, string username, string lastname, string passwordHash, 769 public bool insertUserRow(UUID uuid, string username, string lastname, string passwordHash,
770 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ, 770 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
771 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 771 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
772 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 772 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
773 string aboutText, string firstText, 773 string aboutText, string firstText,
774 LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey) 774 UUID profileImage, UUID firstImage, UUID webLoginKey)
775 { 775 {
776 m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString()); 776 m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString());
777 string sql = 777 string sql =
@@ -867,12 +867,12 @@ namespace OpenSim.Data.MySQL
867 /// <param name="firstImage">UUID for firstlife image</param> 867 /// <param name="firstImage">UUID for firstlife image</param>
868 /// <param name="webLoginKey">UUID for weblogin Key</param> 868 /// <param name="webLoginKey">UUID for weblogin Key</param>
869 /// <returns>Success?</returns> 869 /// <returns>Success?</returns>
870 public bool updateUserRow(LLUUID uuid, string username, string lastname, string passwordHash, 870 public bool updateUserRow(UUID uuid, string username, string lastname, string passwordHash,
871 string passwordSalt, UInt64 homeRegion, LLUUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ, 871 string passwordSalt, UInt64 homeRegion, UUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
872 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 872 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
873 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 873 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
874 string aboutText, string firstText, 874 string aboutText, string firstText,
875 LLUUID profileImage, LLUUID firstImage, LLUUID webLoginKey, int userFlags, int godLevel, string customType, LLUUID partner) 875 UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
876 { 876 {
877 string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname "; 877 string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname ";
878 sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , "; 878 sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , ";
@@ -1211,7 +1211,7 @@ namespace OpenSim.Data.MySQL
1211 1211
1212 } 1212 }
1213 1213
1214 public void writeAttachments(LLUUID agentID, Hashtable data) 1214 public void writeAttachments(UUID agentID, Hashtable data)
1215 { 1215 {
1216 string sql = "delete from avatarattachments where UUID = ?uuid"; 1216 string sql = "delete from avatarattachments where UUID = ?uuid";
1217 1217
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 903f022..9552ba1 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.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 MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -296,15 +296,15 @@ namespace OpenSim.Data.MySQL
296 /// </summary> 296 /// </summary>
297 /// <param name="obj">The object</param> 297 /// <param name="obj">The object</param>
298 /// <param name="regionUUID">The region UUID</param> 298 /// <param name="regionUUID">The region UUID</param>
299 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 299 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
300 { 300 {
301 lock (m_dataSet) 301 lock (m_dataSet)
302 { 302 {
303 foreach (SceneObjectPart prim in obj.Children.Values) 303 foreach (SceneObjectPart prim in obj.Children.Values)
304 { 304 {
305 if ((prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Physics) == 0 305 if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == 0
306 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Temporary) == 0 306 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
307 && (prim.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.TemporaryOnRez) == 0) 307 && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
308 { 308 {
309 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 309 //m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
310 addPrim(prim, obj.UUID, regionUUID); 310 addPrim(prim, obj.UUID, regionUUID);
@@ -323,9 +323,9 @@ namespace OpenSim.Data.MySQL
323 /// </summary> 323 /// </summary>
324 /// <param name="obj">The object</param> 324 /// <param name="obj">The object</param>
325 /// <param name="regionUUID">The Region UUID</param> 325 /// <param name="regionUUID">The Region UUID</param>
326 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 326 public void RemoveObject(UUID obj, UUID regionUUID)
327 { 327 {
328 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 328 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj, regionUUID);
329 329
330 DataTable prims = m_primTable; 330 DataTable prims = m_primTable;
331 DataTable shapes = m_shapeTable; 331 DataTable shapes = m_shapeTable;
@@ -337,7 +337,7 @@ namespace OpenSim.Data.MySQL
337 foreach (DataRow row in primRows) 337 foreach (DataRow row in primRows)
338 { 338 {
339 // Remove shapes row 339 // Remove shapes row
340 LLUUID uuid = new LLUUID((string) row["UUID"]); 340 UUID uuid = new UUID((string) row["UUID"]);
341 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid)); 341 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
342 if (shapeRow != null) 342 if (shapeRow != null)
343 { 343 {
@@ -358,7 +358,7 @@ namespace OpenSim.Data.MySQL
358 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes. 358 /// The caller must acquire the necessrary synchronization locks and commit or rollback changes.
359 /// </summary> 359 /// </summary>
360 /// <param name="uuid">the Item UUID</param> 360 /// <param name="uuid">the Item UUID</param>
361 private void RemoveItems(LLUUID uuid) 361 private void RemoveItems(UUID uuid)
362 { 362 {
363 String sql = String.Format("primID = '{0}'", uuid); 363 String sql = String.Format("primID = '{0}'", uuid);
364 DataRow[] itemRows = m_itemsTable.Select(sql); 364 DataRow[] itemRows = m_itemsTable.Select(sql);
@@ -374,9 +374,9 @@ namespace OpenSim.Data.MySQL
374 /// </summary> 374 /// </summary>
375 /// <param name="regionUUID">the Region UUID</param> 375 /// <param name="regionUUID">the Region UUID</param>
376 /// <returns>List of loaded groups</returns> 376 /// <returns>List of loaded groups</returns>
377 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 377 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
378 { 378 {
379 Dictionary<LLUUID, SceneObjectGroup> createdObjects = new Dictionary<LLUUID, SceneObjectGroup>(); 379 Dictionary<UUID, SceneObjectGroup> createdObjects = new Dictionary<UUID, SceneObjectGroup>();
380 380
381 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); 381 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
382 382
@@ -436,7 +436,7 @@ namespace OpenSim.Data.MySQL
436 "No shape found for prim in storage, so setting default box shape"); 436 "No shape found for prim in storage, so setting default box shape");
437 prim.Shape = PrimitiveBaseShape.Default; 437 prim.Shape = PrimitiveBaseShape.Default;
438 } 438 }
439 createdObjects[new LLUUID(objID)].AddPart(prim); 439 createdObjects[new UUID(objID)].AddPart(prim);
440 } 440 }
441 441
442 LoadItems(prim); 442 LoadItems(prim);
@@ -497,7 +497,7 @@ namespace OpenSim.Data.MySQL
497 /// </summary> 497 /// </summary>
498 /// <param name="ter">HeightField data</param> 498 /// <param name="ter">HeightField data</param>
499 /// <param name="regionID">region UUID</param> 499 /// <param name="regionID">region UUID</param>
500 public void StoreTerrain(double[,] ter, LLUUID regionID) 500 public void StoreTerrain(double[,] ter, UUID regionID)
501 { 501 {
502 int revision = 1; 502 int revision = 1;
503 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString()); 503 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
@@ -527,7 +527,7 @@ namespace OpenSim.Data.MySQL
527 /// </summary> 527 /// </summary>
528 /// <param name="regionID">the region UUID</param> 528 /// <param name="regionID">the region UUID</param>
529 /// <returns>Heightfield data</returns> 529 /// <returns>Heightfield data</returns>
530 public double[,] LoadTerrain(LLUUID regionID) 530 public double[,] LoadTerrain(UUID regionID)
531 { 531 {
532 double[,] terret = new double[256,256]; 532 double[,] terret = new double[256,256];
533 terret.Initialize(); 533 terret.Initialize();
@@ -583,7 +583,7 @@ namespace OpenSim.Data.MySQL
583 /// </list> 583 /// </list>
584 /// </summary> 584 /// </summary>
585 /// <param name="globalID"></param> 585 /// <param name="globalID"></param>
586 public void RemoveLandObject(LLUUID globalID) 586 public void RemoveLandObject(UUID globalID)
587 { 587 {
588 lock (m_dataSet) 588 lock (m_dataSet)
589 { 589 {
@@ -646,7 +646,7 @@ namespace OpenSim.Data.MySQL
646 } 646 }
647 } 647 }
648 648
649 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 649 public RegionSettings LoadRegionSettings(UUID regionUUID)
650 { 650 {
651 lock (m_dataSet) 651 lock (m_dataSet)
652 { 652 {
@@ -701,7 +701,7 @@ namespace OpenSim.Data.MySQL
701 /// </summary> 701 /// </summary>
702 /// <param name="regionUUID"></param> 702 /// <param name="regionUUID"></param>
703 /// <returns></returns> 703 /// <returns></returns>
704 public List<LandData> LoadLandObjects(LLUUID regionUUID) 704 public List<LandData> LoadLandObjects(UUID regionUUID)
705 { 705 {
706 List<LandData> landDataForRegion = new List<LandData>(); 706 List<LandData> landDataForRegion = new List<LandData>();
707 lock (m_dataSet) 707 lock (m_dataSet)
@@ -1101,7 +1101,7 @@ namespace OpenSim.Data.MySQL
1101 private SceneObjectPart buildPrim(DataRow row) 1101 private SceneObjectPart buildPrim(DataRow row)
1102 { 1102 {
1103 SceneObjectPart prim = new SceneObjectPart(); 1103 SceneObjectPart prim = new SceneObjectPart();
1104 prim.UUID = new LLUUID((String) row["UUID"]); 1104 prim.UUID = new UUID((String) row["UUID"]);
1105 // explicit conversion of integers is required, which sort 1105 // explicit conversion of integers is required, which sort
1106 // of sucks. No idea if there is a shortcut here or not. 1106 // of sucks. No idea if there is a shortcut here or not.
1107 prim.ParentID = Convert.ToUInt32(row["ParentID"]); 1107 prim.ParentID = Convert.ToUInt32(row["ParentID"]);
@@ -1114,54 +1114,54 @@ namespace OpenSim.Data.MySQL
1114 prim.TouchName = (String) row["TouchName"]; 1114 prim.TouchName = (String) row["TouchName"];
1115 // permissions 1115 // permissions
1116 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 1116 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
1117 prim.CreatorID = new LLUUID((String) row["CreatorID"]); 1117 prim.CreatorID = new UUID((String) row["CreatorID"]);
1118 prim.OwnerID = new LLUUID((String) row["OwnerID"]); 1118 prim.OwnerID = new UUID((String) row["OwnerID"]);
1119 prim.GroupID = new LLUUID((String) row["GroupID"]); 1119 prim.GroupID = new UUID((String) row["GroupID"]);
1120 prim.LastOwnerID = new LLUUID((String) row["LastOwnerID"]); 1120 prim.LastOwnerID = new UUID((String) row["LastOwnerID"]);
1121 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); 1121 prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
1122 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); 1122 prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
1123 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); 1123 prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
1124 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]); 1124 prim.EveryoneMask = Convert.ToUInt32(row["EveryoneMask"]);
1125 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]); 1125 prim.BaseMask = Convert.ToUInt32(row["BaseMask"]);
1126 // vectors 1126 // vectors
1127 prim.OffsetPosition = new LLVector3( 1127 prim.OffsetPosition = new Vector3(
1128 Convert.ToSingle(row["PositionX"]), 1128 Convert.ToSingle(row["PositionX"]),
1129 Convert.ToSingle(row["PositionY"]), 1129 Convert.ToSingle(row["PositionY"]),
1130 Convert.ToSingle(row["PositionZ"]) 1130 Convert.ToSingle(row["PositionZ"])
1131 ); 1131 );
1132 prim.GroupPosition = new LLVector3( 1132 prim.GroupPosition = new Vector3(
1133 Convert.ToSingle(row["GroupPositionX"]), 1133 Convert.ToSingle(row["GroupPositionX"]),
1134 Convert.ToSingle(row["GroupPositionY"]), 1134 Convert.ToSingle(row["GroupPositionY"]),
1135 Convert.ToSingle(row["GroupPositionZ"]) 1135 Convert.ToSingle(row["GroupPositionZ"])
1136 ); 1136 );
1137 prim.Velocity = new LLVector3( 1137 prim.Velocity = new Vector3(
1138 Convert.ToSingle(row["VelocityX"]), 1138 Convert.ToSingle(row["VelocityX"]),
1139 Convert.ToSingle(row["VelocityY"]), 1139 Convert.ToSingle(row["VelocityY"]),
1140 Convert.ToSingle(row["VelocityZ"]) 1140 Convert.ToSingle(row["VelocityZ"])
1141 ); 1141 );
1142 prim.AngularVelocity = new LLVector3( 1142 prim.AngularVelocity = new Vector3(
1143 Convert.ToSingle(row["AngularVelocityX"]), 1143 Convert.ToSingle(row["AngularVelocityX"]),
1144 Convert.ToSingle(row["AngularVelocityY"]), 1144 Convert.ToSingle(row["AngularVelocityY"]),
1145 Convert.ToSingle(row["AngularVelocityZ"]) 1145 Convert.ToSingle(row["AngularVelocityZ"])
1146 ); 1146 );
1147 prim.Acceleration = new LLVector3( 1147 prim.Acceleration = new Vector3(
1148 Convert.ToSingle(row["AccelerationX"]), 1148 Convert.ToSingle(row["AccelerationX"]),
1149 Convert.ToSingle(row["AccelerationY"]), 1149 Convert.ToSingle(row["AccelerationY"]),
1150 Convert.ToSingle(row["AccelerationZ"]) 1150 Convert.ToSingle(row["AccelerationZ"])
1151 ); 1151 );
1152 // quaternions 1152 // quaternions
1153 prim.RotationOffset = new LLQuaternion( 1153 prim.RotationOffset = new Quaternion(
1154 Convert.ToSingle(row["RotationX"]), 1154 Convert.ToSingle(row["RotationX"]),
1155 Convert.ToSingle(row["RotationY"]), 1155 Convert.ToSingle(row["RotationY"]),
1156 Convert.ToSingle(row["RotationZ"]), 1156 Convert.ToSingle(row["RotationZ"]),
1157 Convert.ToSingle(row["RotationW"]) 1157 Convert.ToSingle(row["RotationW"])
1158 ); 1158 );
1159 prim.SitTargetPositionLL = new LLVector3( 1159 prim.SitTargetPositionLL = new Vector3(
1160 Convert.ToSingle(row["SitTargetOffsetX"]), 1160 Convert.ToSingle(row["SitTargetOffsetX"]),
1161 Convert.ToSingle(row["SitTargetOffsetY"]), 1161 Convert.ToSingle(row["SitTargetOffsetY"]),
1162 Convert.ToSingle(row["SitTargetOffsetZ"]) 1162 Convert.ToSingle(row["SitTargetOffsetZ"])
1163 ); 1163 );
1164 prim.SitTargetOrientationLL = new LLQuaternion( 1164 prim.SitTargetOrientationLL = new Quaternion(
1165 Convert.ToSingle(row["SitTargetOrientX"]), 1165 Convert.ToSingle(row["SitTargetOrientX"]),
1166 Convert.ToSingle(row["SitTargetOrientY"]), 1166 Convert.ToSingle(row["SitTargetOrientY"]),
1167 Convert.ToSingle(row["SitTargetOrientZ"]), 1167 Convert.ToSingle(row["SitTargetOrientZ"]),
@@ -1174,14 +1174,14 @@ namespace OpenSim.Data.MySQL
1174 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]); 1174 prim.PayPrice[3] = Convert.ToInt32(row["PayButton3"]);
1175 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]); 1175 prim.PayPrice[4] = Convert.ToInt32(row["PayButton4"]);
1176 1176
1177 prim.Sound = new LLUUID(row["LoopedSound"].ToString()); 1177 prim.Sound = new UUID(row["LoopedSound"].ToString());
1178 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]); 1178 prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
1179 prim.SoundFlags = 1; // If it's persisted at all, it's looped 1179 prim.SoundFlags = 1; // If it's persisted at all, it's looped
1180 1180
1181 if (!row.IsNull("TextureAnimation")) 1181 if (!row.IsNull("TextureAnimation"))
1182 prim.TextureAnimation = (Byte[])row["TextureAnimation"]; 1182 prim.TextureAnimation = (Byte[])row["TextureAnimation"];
1183 1183
1184 prim.RotationalVelocity = new LLVector3( 1184 prim.RotationalVelocity = new Vector3(
1185 Convert.ToSingle(row["OmegaX"]), 1185 Convert.ToSingle(row["OmegaX"]),
1186 Convert.ToSingle(row["OmegaY"]), 1186 Convert.ToSingle(row["OmegaY"]),
1187 Convert.ToSingle(row["OmegaZ"]) 1187 Convert.ToSingle(row["OmegaZ"])
@@ -1190,13 +1190,13 @@ namespace OpenSim.Data.MySQL
1190 // TODO: Rotation 1190 // TODO: Rotation
1191 // OmegaX, OmegaY, OmegaZ 1191 // OmegaX, OmegaY, OmegaZ
1192 1192
1193 prim.SetCameraEyeOffset(new LLVector3( 1193 prim.SetCameraEyeOffset(new Vector3(
1194 Convert.ToSingle(row["CameraEyeOffsetX"]), 1194 Convert.ToSingle(row["CameraEyeOffsetX"]),
1195 Convert.ToSingle(row["CameraEyeOffsetY"]), 1195 Convert.ToSingle(row["CameraEyeOffsetY"]),
1196 Convert.ToSingle(row["CameraEyeOffsetZ"]) 1196 Convert.ToSingle(row["CameraEyeOffsetZ"])
1197 )); 1197 ));
1198 1198
1199 prim.SetCameraAtOffset(new LLVector3( 1199 prim.SetCameraAtOffset(new Vector3(
1200 Convert.ToSingle(row["CameraAtOffsetX"]), 1200 Convert.ToSingle(row["CameraAtOffsetX"]),
1201 Convert.ToSingle(row["CameraAtOffsetY"]), 1201 Convert.ToSingle(row["CameraAtOffsetY"]),
1202 Convert.ToSingle(row["CameraAtOffsetZ"]) 1202 Convert.ToSingle(row["CameraAtOffsetZ"])
@@ -1229,10 +1229,10 @@ namespace OpenSim.Data.MySQL
1229 { 1229 {
1230 TaskInventoryItem taskItem = new TaskInventoryItem(); 1230 TaskInventoryItem taskItem = new TaskInventoryItem();
1231 1231
1232 taskItem.ItemID = new LLUUID((String)row["itemID"]); 1232 taskItem.ItemID = new UUID((String)row["itemID"]);
1233 taskItem.ParentPartID = new LLUUID((String)row["primID"]); 1233 taskItem.ParentPartID = new UUID((String)row["primID"]);
1234 taskItem.AssetID = new LLUUID((String)row["assetID"]); 1234 taskItem.AssetID = new UUID((String)row["assetID"]);
1235 taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); 1235 taskItem.ParentID = new UUID((String)row["parentFolderID"]);
1236 1236
1237 taskItem.InvType = Convert.ToInt32(row["invType"]); 1237 taskItem.InvType = Convert.ToInt32(row["invType"]);
1238 taskItem.Type = Convert.ToInt32(row["assetType"]); 1238 taskItem.Type = Convert.ToInt32(row["assetType"]);
@@ -1240,10 +1240,10 @@ namespace OpenSim.Data.MySQL
1240 taskItem.Name = (String)row["name"]; 1240 taskItem.Name = (String)row["name"];
1241 taskItem.Description = (String)row["description"]; 1241 taskItem.Description = (String)row["description"];
1242 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1242 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1243 taskItem.CreatorID = new LLUUID((String)row["creatorID"]); 1243 taskItem.CreatorID = new UUID((String)row["creatorID"]);
1244 taskItem.OwnerID = new LLUUID((String)row["ownerID"]); 1244 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1245 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1245 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1246 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1246 taskItem.GroupID = new UUID((String)row["groupID"]);
1247 1247
1248 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); 1248 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1249 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); 1249 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
@@ -1259,7 +1259,7 @@ namespace OpenSim.Data.MySQL
1259 { 1259 {
1260 RegionSettings newSettings = new RegionSettings(); 1260 RegionSettings newSettings = new RegionSettings();
1261 1261
1262 newSettings.RegionUUID = new LLUUID((string) row["regionUUID"]); 1262 newSettings.RegionUUID = new UUID((string) row["regionUUID"]);
1263 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]); 1263 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
1264 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]); 1264 newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
1265 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]); 1265 newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
@@ -1273,10 +1273,10 @@ namespace OpenSim.Data.MySQL
1273 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]); 1273 newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
1274 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]); 1274 newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
1275 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]); 1275 newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
1276 newSettings.TerrainTexture1 = new LLUUID((String) row["terrain_texture_1"]); 1276 newSettings.TerrainTexture1 = new UUID((String) row["terrain_texture_1"]);
1277 newSettings.TerrainTexture2 = new LLUUID((String) row["terrain_texture_2"]); 1277 newSettings.TerrainTexture2 = new UUID((String) row["terrain_texture_2"]);
1278 newSettings.TerrainTexture3 = new LLUUID((String) row["terrain_texture_3"]); 1278 newSettings.TerrainTexture3 = new UUID((String) row["terrain_texture_3"]);
1279 newSettings.TerrainTexture4 = new LLUUID((String) row["terrain_texture_4"]); 1279 newSettings.TerrainTexture4 = new UUID((String) row["terrain_texture_4"]);
1280 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]); 1280 newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
1281 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]); 1281 newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
1282 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]); 1282 newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
@@ -1292,7 +1292,7 @@ namespace OpenSim.Data.MySQL
1292 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); 1292 newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
1293 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); 1293 newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
1294 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); 1294 newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
1295 newSettings.Covenant = new LLUUID((String) row["covenant"]); 1295 newSettings.Covenant = new UUID((String) row["covenant"]);
1296 1296
1297 return newSettings; 1297 return newSettings;
1298 } 1298 }
@@ -1306,7 +1306,7 @@ namespace OpenSim.Data.MySQL
1306 { 1306 {
1307 LandData newData = new LandData(); 1307 LandData newData = new LandData();
1308 1308
1309 newData.GlobalID = new LLUUID((String) row["UUID"]); 1309 newData.GlobalID = new UUID((String) row["UUID"]);
1310 newData.LocalID = Convert.ToInt32(row["LocalLandID"]); 1310 newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
1311 1311
1312 // Bitmap is a byte[512] 1312 // Bitmap is a byte[512]
@@ -1322,39 +1322,39 @@ namespace OpenSim.Data.MySQL
1322 //Enum libsecondlife.Parcel.ParcelCategory 1322 //Enum libsecondlife.Parcel.ParcelCategory
1323 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]); 1323 newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
1324 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]); 1324 newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
1325 newData.GroupID = new LLUUID((String) row["GroupUUID"]); 1325 newData.GroupID = new UUID((String) row["GroupUUID"]);
1326 newData.SalePrice = Convert.ToInt32(row["SalePrice"]); 1326 newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
1327 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]); 1327 newData.Status = (Parcel.ParcelStatus) Convert.ToInt32(row["LandStatus"]);
1328 //Enum. libsecondlife.Parcel.ParcelStatus 1328 //Enum. libsecondlife.Parcel.ParcelStatus
1329 newData.Flags = Convert.ToUInt32(row["LandFlags"]); 1329 newData.Flags = Convert.ToUInt32(row["LandFlags"]);
1330 newData.LandingType = Convert.ToByte(row["LandingType"]); 1330 newData.LandingType = Convert.ToByte(row["LandingType"]);
1331 newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]); 1331 newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
1332 newData.MediaID = new LLUUID((String) row["MediaTextureUUID"]); 1332 newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
1333 newData.MediaURL = (String) row["MediaURL"]; 1333 newData.MediaURL = (String) row["MediaURL"];
1334 newData.MusicURL = (String) row["MusicURL"]; 1334 newData.MusicURL = (String) row["MusicURL"];
1335 newData.PassHours = Convert.ToSingle(row["PassHours"]); 1335 newData.PassHours = Convert.ToSingle(row["PassHours"]);
1336 newData.PassPrice = Convert.ToInt32(row["PassPrice"]); 1336 newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
1337 LLUUID authedbuyer = LLUUID.Zero; 1337 UUID authedbuyer = UUID.Zero;
1338 LLUUID snapshotID = LLUUID.Zero; 1338 UUID snapshotID = UUID.Zero;
1339 1339
1340 Helpers.TryParse((string)row["AuthBuyerID"], out authedbuyer); 1340 UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer);
1341 Helpers.TryParse((string)row["SnapshotUUID"], out snapshotID); 1341 UUID.TryParse((string)row["SnapshotUUID"], out snapshotID);
1342 1342
1343 newData.AuthBuyerID = authedbuyer; 1343 newData.AuthBuyerID = authedbuyer;
1344 newData.SnapshotID = snapshotID; 1344 newData.SnapshotID = snapshotID;
1345 try 1345 try
1346 { 1346 {
1347 newData.UserLocation = 1347 newData.UserLocation =
1348 new LLVector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]), 1348 new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
1349 Convert.ToSingle(row["UserLocationZ"])); 1349 Convert.ToSingle(row["UserLocationZ"]));
1350 newData.UserLookAt = 1350 newData.UserLookAt =
1351 new LLVector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]), 1351 new Vector3(Convert.ToSingle(row["UserLookAtX"]), Convert.ToSingle(row["UserLookAtY"]),
1352 Convert.ToSingle(row["UserLookAtZ"])); 1352 Convert.ToSingle(row["UserLookAtZ"]));
1353 } 1353 }
1354 catch (InvalidCastException) 1354 catch (InvalidCastException)
1355 { 1355 {
1356 newData.UserLocation = LLVector3.Zero; 1356 newData.UserLocation = Vector3.Zero;
1357 newData.UserLookAt = LLVector3.Zero; 1357 newData.UserLookAt = Vector3.Zero;
1358 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name); 1358 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
1359 } 1359 }
1360 1360
@@ -1371,7 +1371,7 @@ namespace OpenSim.Data.MySQL
1371 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) 1371 private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row)
1372 { 1372 {
1373 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 1373 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1374 entry.AgentID = new LLUUID((string) row["AccessUUID"]); 1374 entry.AgentID = new UUID((string) row["AccessUUID"]);
1375 entry.Flags = (ParcelManager.AccessList) Convert.ToInt32(row["Flags"]); 1375 entry.Flags = (ParcelManager.AccessList) Convert.ToInt32(row["Flags"]);
1376 entry.Time = new DateTime(); 1376 entry.Time = new DateTime();
1377 return entry; 1377 return entry;
@@ -1408,7 +1408,7 @@ namespace OpenSim.Data.MySQL
1408 /// <param name="prim"></param> 1408 /// <param name="prim"></param>
1409 /// <param name="sceneGroupID"></param> 1409 /// <param name="sceneGroupID"></param>
1410 /// <param name="regionUUID"></param> 1410 /// <param name="regionUUID"></param>
1411 private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1411 private void fillPrimRow(DataRow row, SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1412 { 1412 {
1413 row["UUID"] = Util.ToRawUuidString(prim.UUID); 1413 row["UUID"] = Util.ToRawUuidString(prim.UUID);
1414 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1414 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1456,12 +1456,12 @@ namespace OpenSim.Data.MySQL
1456 row["RotationW"] = prim.RotationOffset.W; 1456 row["RotationW"] = prim.RotationOffset.W;
1457 1457
1458 // Sit target 1458 // Sit target
1459 LLVector3 sitTargetPos = prim.SitTargetPositionLL; 1459 Vector3 sitTargetPos = prim.SitTargetPositionLL;
1460 row["SitTargetOffsetX"] = sitTargetPos.X; 1460 row["SitTargetOffsetX"] = sitTargetPos.X;
1461 row["SitTargetOffsetY"] = sitTargetPos.Y; 1461 row["SitTargetOffsetY"] = sitTargetPos.Y;
1462 row["SitTargetOffsetZ"] = sitTargetPos.Z; 1462 row["SitTargetOffsetZ"] = sitTargetPos.Z;
1463 1463
1464 LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; 1464 Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
1465 row["SitTargetOrientW"] = sitTargetOrient.W; 1465 row["SitTargetOrientW"] = sitTargetOrient.W;
1466 row["SitTargetOrientX"] = sitTargetOrient.X; 1466 row["SitTargetOrientX"] = sitTargetOrient.X;
1467 row["SitTargetOrientY"] = sitTargetOrient.Y; 1467 row["SitTargetOrientY"] = sitTargetOrient.Y;
@@ -1480,7 +1480,7 @@ namespace OpenSim.Data.MySQL
1480 } 1480 }
1481 else 1481 else
1482 { 1482 {
1483 row["LoopedSound"] = LLUUID.Zero; 1483 row["LoopedSound"] = UUID.Zero;
1484 row["LoopedSoundGain"] = 0.0f; 1484 row["LoopedSoundGain"] = 0.0f;
1485 } 1485 }
1486 1486
@@ -1597,7 +1597,7 @@ namespace OpenSim.Data.MySQL
1597 /// <param name="row"></param> 1597 /// <param name="row"></param>
1598 /// <param name="land"></param> 1598 /// <param name="land"></param>
1599 /// <param name="regionUUID"></param> 1599 /// <param name="regionUUID"></param>
1600 private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) 1600 private static void fillLandRow(DataRow row, LandData land, UUID regionUUID)
1601 { 1601 {
1602 row["UUID"] = Util.ToRawUuidString(land.GlobalID); 1602 row["UUID"] = Util.ToRawUuidString(land.GlobalID);
1603 row["RegionUUID"] = Util.ToRawUuidString(regionUUID); 1603 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
@@ -1642,7 +1642,7 @@ namespace OpenSim.Data.MySQL
1642 /// <param name="row"></param> 1642 /// <param name="row"></param>
1643 /// <param name="entry"></param> 1643 /// <param name="entry"></param>
1644 /// <param name="parcelID"></param> 1644 /// <param name="parcelID"></param>
1645 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) 1645 private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, UUID parcelID)
1646 { 1646 {
1647 row["LandUUID"] = Util.ToRawUuidString(parcelID); 1647 row["LandUUID"] = Util.ToRawUuidString(parcelID);
1648 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); 1648 row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID);
@@ -1657,7 +1657,7 @@ namespace OpenSim.Data.MySQL
1657 private PrimitiveBaseShape buildShape(DataRow row) 1657 private PrimitiveBaseShape buildShape(DataRow row)
1658 { 1658 {
1659 PrimitiveBaseShape s = new PrimitiveBaseShape(); 1659 PrimitiveBaseShape s = new PrimitiveBaseShape();
1660 s.Scale = new LLVector3( 1660 s.Scale = new Vector3(
1661 Convert.ToSingle(row["ScaleX"]), 1661 Convert.ToSingle(row["ScaleX"]),
1662 Convert.ToSingle(row["ScaleY"]), 1662 Convert.ToSingle(row["ScaleY"]),
1663 Convert.ToSingle(row["ScaleZ"]) 1663 Convert.ToSingle(row["ScaleZ"])
@@ -1778,7 +1778,7 @@ namespace OpenSim.Data.MySQL
1778 /// <param name="prim"></param> 1778 /// <param name="prim"></param>
1779 /// <param name="sceneGroupID"></param> 1779 /// <param name="sceneGroupID"></param>
1780 /// <param name="regionUUID"></param> 1780 /// <param name="regionUUID"></param>
1781 private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 1781 private void addPrim(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
1782 { 1782 {
1783 lock (m_dataSet) 1783 lock (m_dataSet)
1784 { 1784 {
@@ -1816,7 +1816,7 @@ namespace OpenSim.Data.MySQL
1816 /// </summary> 1816 /// </summary>
1817 /// <param name="primID"></param> 1817 /// <param name="primID"></param>
1818 /// <param name="items"></param> 1818 /// <param name="items"></param>
1819 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 1819 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
1820 { 1820 {
1821 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); 1821 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
1822 1822
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 8d0b177..42983b1 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using MySql.Data.MySqlClient; 37using MySql.Data.MySqlClient;
@@ -221,15 +221,15 @@ namespace OpenSim.Data.MySQL
221 221
222 #region User Friends List Data 222 #region User Friends List Data
223 223
224 public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 224 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
225 { 225 {
226 MySQLSuperManager dbm = GetLockedConnection(); 226 MySQLSuperManager dbm = GetLockedConnection();
227 227
228 int dtvalue = Util.UnixTimeSinceEpoch(); 228 int dtvalue = Util.UnixTimeSinceEpoch();
229 229
230 Dictionary<string, string> param = new Dictionary<string, string>(); 230 Dictionary<string, string> param = new Dictionary<string, string>();
231 param["?ownerID"] = friendlistowner.UUID.ToString(); 231 param["?ownerID"] = friendlistowner.ToString();
232 param["?friendID"] = friend.UUID.ToString(); 232 param["?friendID"] = friend.ToString();
233 param["?friendPerms"] = perms.ToString(); 233 param["?friendPerms"] = perms.ToString();
234 param["?datetimestamp"] = dtvalue.ToString(); 234 param["?datetimestamp"] = dtvalue.ToString();
235 235
@@ -265,13 +265,13 @@ namespace OpenSim.Data.MySQL
265 } 265 }
266 } 266 }
267 267
268 public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 268 public override void RemoveUserFriend(UUID friendlistowner, UUID friend)
269 { 269 {
270 MySQLSuperManager dbm = GetLockedConnection(); 270 MySQLSuperManager dbm = GetLockedConnection();
271 271
272 Dictionary<string, string> param = new Dictionary<string, string>(); 272 Dictionary<string, string> param = new Dictionary<string, string>();
273 param["?ownerID"] = friendlistowner.UUID.ToString(); 273 param["?ownerID"] = friendlistowner.ToString();
274 param["?friendID"] = friend.UUID.ToString(); 274 param["?friendID"] = friend.ToString();
275 275
276 try 276 try
277 { 277 {
@@ -299,13 +299,13 @@ namespace OpenSim.Data.MySQL
299 } 299 }
300 } 300 }
301 301
302 public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 302 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
303 { 303 {
304 MySQLSuperManager dbm = GetLockedConnection(); 304 MySQLSuperManager dbm = GetLockedConnection();
305 305
306 Dictionary<string, string> param = new Dictionary<string, string>(); 306 Dictionary<string, string> param = new Dictionary<string, string>();
307 param["?ownerID"] = friendlistowner.UUID.ToString(); 307 param["?ownerID"] = friendlistowner.ToString();
308 param["?friendID"] = friend.UUID.ToString(); 308 param["?friendID"] = friend.ToString();
309 param["?friendPerms"] = perms.ToString(); 309 param["?friendPerms"] = perms.ToString();
310 310
311 try 311 try
@@ -330,13 +330,13 @@ namespace OpenSim.Data.MySQL
330 } 330 }
331 } 331 }
332 332
333 public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 333 public override List<FriendListItem> GetUserFriendList(UUID friendlistowner)
334 { 334 {
335 MySQLSuperManager dbm = GetLockedConnection(); 335 MySQLSuperManager dbm = GetLockedConnection();
336 List<FriendListItem> Lfli = new List<FriendListItem>(); 336 List<FriendListItem> Lfli = new List<FriendListItem>();
337 337
338 Dictionary<string, string> param = new Dictionary<string, string>(); 338 Dictionary<string, string> param = new Dictionary<string, string>();
339 param["?ownerID"] = friendlistowner.UUID.ToString(); 339 param["?ownerID"] = friendlistowner.ToString();
340 340
341 try 341 try
342 { 342 {
@@ -352,8 +352,8 @@ namespace OpenSim.Data.MySQL
352 while (reader.Read()) 352 while (reader.Read())
353 { 353 {
354 FriendListItem fli = new FriendListItem(); 354 FriendListItem fli = new FriendListItem();
355 fli.FriendListOwner = new LLUUID((string) reader["ownerID"]); 355 fli.FriendListOwner = new UUID((string) reader["ownerID"]);
356 fli.Friend = new LLUUID((string) reader["friendID"]); 356 fli.Friend = new UUID((string) reader["friendID"]);
357 fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]); 357 fli.FriendPerms = (uint) Convert.ToInt32(reader["friendPerms"]);
358 358
359 // This is not a real column in the database table, it's a joined column from the opposite record 359 // This is not a real column in the database table, it's a joined column from the opposite record
@@ -381,12 +381,12 @@ namespace OpenSim.Data.MySQL
381 381
382 #endregion 382 #endregion
383 383
384 public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 384 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
385 { 385 {
386 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called"); 386 //m_log.Info("[USER DB]: Stub UpdateUserCUrrentRegion called");
387 } 387 }
388 388
389 public override List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 389 public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
390 { 390 {
391 MySQLSuperManager dbm = GetLockedConnection(); 391 MySQLSuperManager dbm = GetLockedConnection();
392 392
@@ -413,7 +413,7 @@ namespace OpenSim.Data.MySQL
413 while (reader.Read()) 413 while (reader.Read())
414 { 414 {
415 AvatarPickerAvatar user = new AvatarPickerAvatar(); 415 AvatarPickerAvatar user = new AvatarPickerAvatar();
416 user.AvatarID = new LLUUID((string) reader["UUID"]); 416 user.AvatarID = new UUID((string) reader["UUID"]);
417 user.firstName = (string) reader["username"]; 417 user.firstName = (string) reader["username"];
418 user.lastName = (string) reader["lastname"]; 418 user.lastName = (string) reader["lastname"];
419 returnlist.Add(user); 419 returnlist.Add(user);
@@ -449,7 +449,7 @@ namespace OpenSim.Data.MySQL
449 while (reader.Read()) 449 while (reader.Read())
450 { 450 {
451 AvatarPickerAvatar user = new AvatarPickerAvatar(); 451 AvatarPickerAvatar user = new AvatarPickerAvatar();
452 user.AvatarID = new LLUUID((string) reader["UUID"]); 452 user.AvatarID = new UUID((string) reader["UUID"]);
453 user.firstName = (string) reader["username"]; 453 user.firstName = (string) reader["username"];
454 user.lastName = (string) reader["lastname"]; 454 user.lastName = (string) reader["lastname"];
455 returnlist.Add(user); 455 returnlist.Add(user);
@@ -476,7 +476,7 @@ namespace OpenSim.Data.MySQL
476 /// </summary> 476 /// </summary>
477 /// <param name="uuid">User UUID</param> 477 /// <param name="uuid">User UUID</param>
478 /// <returns>User profile data</returns> 478 /// <returns>User profile data</returns>
479 public override UserProfileData GetUserByUUID(LLUUID uuid) 479 public override UserProfileData GetUserByUUID(UUID uuid)
480 { 480 {
481 MySQLSuperManager dbm = GetLockedConnection(); 481 MySQLSuperManager dbm = GetLockedConnection();
482 try 482 try
@@ -533,13 +533,13 @@ namespace OpenSim.Data.MySQL
533 /// <param name="AgentID"></param> 533 /// <param name="AgentID"></param>
534 /// <param name="WebLoginKey"></param> 534 /// <param name="WebLoginKey"></param>
535 /// <remarks>is it still used ?</remarks> 535 /// <remarks>is it still used ?</remarks>
536 public override void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 536 public override void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
537 { 537 {
538 MySQLSuperManager dbm = GetLockedConnection(); 538 MySQLSuperManager dbm = GetLockedConnection();
539 539
540 Dictionary<string, string> param = new Dictionary<string, string>(); 540 Dictionary<string, string> param = new Dictionary<string, string>();
541 param["?UUID"] = AgentID.UUID.ToString(); 541 param["?UUID"] = AgentID.ToString();
542 param["?webLoginKey"] = WebLoginKey.UUID.ToString(); 542 param["?webLoginKey"] = WebLoginKey.ToString();
543 543
544 try 544 try
545 { 545 {
@@ -565,7 +565,7 @@ namespace OpenSim.Data.MySQL
565 /// </summary> 565 /// </summary>
566 /// <param name="uuid">The accounts UUID</param> 566 /// <param name="uuid">The accounts UUID</param>
567 /// <returns>The users session</returns> 567 /// <returns>The users session</returns>
568 public override UserAgentData GetAgentByUUID(LLUUID uuid) 568 public override UserAgentData GetAgentByUUID(UUID uuid)
569 { 569 {
570 MySQLSuperManager dbm = GetLockedConnection(); 570 MySQLSuperManager dbm = GetLockedConnection();
571 571
@@ -682,7 +682,7 @@ namespace OpenSim.Data.MySQL
682 /// <param name="to">The receivers account ID</param> 682 /// <param name="to">The receivers account ID</param>
683 /// <param name="amount">The amount to transfer</param> 683 /// <param name="amount">The amount to transfer</param>
684 /// <returns>Success?</returns> 684 /// <returns>Success?</returns>
685 public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) 685 public override bool MoneyTransferRequest(UUID from, UUID to, uint amount)
686 { 686 {
687 return false; 687 return false;
688 } 688 }
@@ -695,7 +695,7 @@ namespace OpenSim.Data.MySQL
695 /// <param name="to">The receivers account ID</param> 695 /// <param name="to">The receivers account ID</param>
696 /// <param name="item">The item to transfer</param> 696 /// <param name="item">The item to transfer</param>
697 /// <returns>Success?</returns> 697 /// <returns>Success?</returns>
698 public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) 698 public override bool InventoryTransferRequest(UUID from, UUID to, UUID item)
699 { 699 {
700 return false; 700 return false;
701 } 701 }
@@ -705,7 +705,7 @@ namespace OpenSim.Data.MySQL
705 /// TODO: stubs for now to get us to a compiling state gently 705 /// TODO: stubs for now to get us to a compiling state gently
706 /// override 706 /// override
707 /// </summary> 707 /// </summary>
708 public override AvatarAppearance GetUserAppearance(LLUUID user) 708 public override AvatarAppearance GetUserAppearance(UUID user)
709 { 709 {
710 MySQLSuperManager dbm = GetLockedConnection(); 710 MySQLSuperManager dbm = GetLockedConnection();
711 try 711 try
@@ -744,7 +744,7 @@ namespace OpenSim.Data.MySQL
744 /// <param name="user">The user UUID</param> 744 /// <param name="user">The user UUID</param>
745 /// <param name="appearance">The avatar appearance</param> 745 /// <param name="appearance">The avatar appearance</param>
746 // override 746 // override
747 public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 747 public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
748 { 748 {
749 MySQLSuperManager dbm = GetLockedConnection(); 749 MySQLSuperManager dbm = GetLockedConnection();
750 try 750 try
@@ -783,7 +783,7 @@ namespace OpenSim.Data.MySQL
783 get { return "0.1"; } 783 get { return "0.1"; }
784 } 784 }
785 785
786 public Hashtable GetUserAttachments(LLUUID agentID) 786 public Hashtable GetUserAttachments(UUID agentID)
787 { 787 {
788 MySQLSuperManager dbm = GetLockedConnection(); 788 MySQLSuperManager dbm = GetLockedConnection();
789 789
@@ -814,7 +814,7 @@ namespace OpenSim.Data.MySQL
814 } 814 }
815 } 815 }
816 816
817 public void UpdateUserAttachments(LLUUID agentID, Hashtable data) 817 public void UpdateUserAttachments(UUID agentID, Hashtable data)
818 { 818 {
819 MySQLSuperManager dbm = GetLockedConnection(); 819 MySQLSuperManager dbm = GetLockedConnection();
820 try 820 try
@@ -827,7 +827,7 @@ namespace OpenSim.Data.MySQL
827 } 827 }
828 } 828 }
829 829
830 public override void ResetAttachments(LLUUID userID) 830 public override void ResetAttachments(UUID userID)
831 { 831 {
832 MySQLSuperManager dbm = GetLockedConnection(); 832 MySQLSuperManager dbm = GetLockedConnection();
833 833
@@ -847,4 +847,4 @@ namespace OpenSim.Data.MySQL
847 } 847 }
848 } 848 }
849 } 849 }
850} \ No newline at end of file 850}
generated by cgit v1.1 at 2024-07-20 02:05:01 +0000