diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-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/MSSQL/MSSQLInventoryData.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 9e60b16..e7df7c1 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SqlClient; | 31 | using System.Data.SqlClient; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | 36 | ||
@@ -167,7 +167,7 @@ namespace OpenSim.Data.MSSQL | |||
167 | /// </summary> | 167 | /// </summary> |
168 | /// <param name="folderID">The folder to search</param> | 168 | /// <param name="folderID">The folder to search</param> |
169 | /// <returns>A list containing inventory items</returns> | 169 | /// <returns>A list containing inventory items</returns> |
170 | public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) | 170 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) |
171 | { | 171 | { |
172 | try | 172 | try |
173 | { | 173 | { |
@@ -201,13 +201,13 @@ namespace OpenSim.Data.MSSQL | |||
201 | /// </summary> | 201 | /// </summary> |
202 | /// <param name="user">The user whos inventory is to be searched</param> | 202 | /// <param name="user">The user whos inventory is to be searched</param> |
203 | /// <returns>A list of folder objects</returns> | 203 | /// <returns>A list of folder objects</returns> |
204 | public List<InventoryFolderBase> getUserRootFolders(LLUUID user) | 204 | public List<InventoryFolderBase> getUserRootFolders(UUID user) |
205 | { | 205 | { |
206 | try | 206 | try |
207 | { | 207 | { |
208 | Dictionary<string, string> param = new Dictionary<string, string>(); | 208 | Dictionary<string, string> param = new Dictionary<string, string>(); |
209 | param["uuid"] = user.ToString(); | 209 | param["uuid"] = user.ToString(); |
210 | param["zero"] = LLUUID.Zero.ToString(); | 210 | param["zero"] = UUID.Zero.ToString(); |
211 | 211 | ||
212 | using (IDbCommand result = | 212 | using (IDbCommand result = |
213 | database.Query( | 213 | database.Query( |
@@ -235,13 +235,13 @@ namespace OpenSim.Data.MSSQL | |||
235 | /// </summary> | 235 | /// </summary> |
236 | /// <param name="user">the User UUID</param> | 236 | /// <param name="user">the User UUID</param> |
237 | /// <returns></returns> | 237 | /// <returns></returns> |
238 | public InventoryFolderBase getUserRootFolder(LLUUID user) | 238 | public InventoryFolderBase getUserRootFolder(UUID user) |
239 | { | 239 | { |
240 | try | 240 | try |
241 | { | 241 | { |
242 | Dictionary<string, string> param = new Dictionary<string, string>(); | 242 | Dictionary<string, string> param = new Dictionary<string, string>(); |
243 | param["uuid"] = user.ToString(); | 243 | param["uuid"] = user.ToString(); |
244 | param["zero"] = LLUUID.Zero.ToString(); | 244 | param["zero"] = UUID.Zero.ToString(); |
245 | 245 | ||
246 | using (IDbCommand result = | 246 | using (IDbCommand result = |
247 | database.Query( | 247 | database.Query( |
@@ -281,7 +281,7 @@ namespace OpenSim.Data.MSSQL | |||
281 | /// </summary> | 281 | /// </summary> |
282 | /// <param name="parentID">The folder to search</param> | 282 | /// <param name="parentID">The folder to search</param> |
283 | /// <returns>A list of inventory folders</returns> | 283 | /// <returns>A list of inventory folders</returns> |
284 | public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) | 284 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) |
285 | { | 285 | { |
286 | try | 286 | try |
287 | { | 287 | { |
@@ -318,23 +318,23 @@ namespace OpenSim.Data.MSSQL | |||
318 | { | 318 | { |
319 | InventoryItemBase item = new InventoryItemBase(); | 319 | InventoryItemBase item = new InventoryItemBase(); |
320 | 320 | ||
321 | item.ID = new LLUUID((string) reader["inventoryID"]); | 321 | item.ID = new UUID((string) reader["inventoryID"]); |
322 | item.AssetID = new LLUUID((string) reader["assetID"]); | 322 | item.AssetID = new UUID((string) reader["assetID"]); |
323 | item.AssetType = (int) reader["assetType"]; | 323 | item.AssetType = (int) reader["assetType"]; |
324 | item.Folder = new LLUUID((string) reader["parentFolderID"]); | 324 | item.Folder = new UUID((string) reader["parentFolderID"]); |
325 | item.Owner = new LLUUID((string) reader["avatarID"]); | 325 | item.Owner = new UUID((string) reader["avatarID"]); |
326 | item.Name = (string) reader["inventoryName"]; | 326 | item.Name = (string) reader["inventoryName"]; |
327 | item.Description = (string) reader["inventoryDescription"]; | 327 | item.Description = (string) reader["inventoryDescription"]; |
328 | item.NextPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryNextPermissions"]); | 328 | item.NextPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryNextPermissions"]); |
329 | item.CurrentPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryCurrentPermissions"]); | 329 | item.CurrentPermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryCurrentPermissions"]); |
330 | item.InvType = (int) reader["invType"]; | 330 | item.InvType = (int) reader["invType"]; |
331 | item.Creator = new LLUUID((string) reader["creatorID"]); | 331 | item.Creator = new UUID((string) reader["creatorID"]); |
332 | item.BasePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryBasePermissions"]); | 332 | item.BasePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryBasePermissions"]); |
333 | item.EveryOnePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryEveryOnePermissions"]); | 333 | item.EveryOnePermissions = ConvertInt32BitFieldToUint32((int)reader["inventoryEveryOnePermissions"]); |
334 | item.SalePrice = (int) reader["salePrice"]; | 334 | item.SalePrice = (int) reader["salePrice"]; |
335 | item.SaleType = Convert.ToByte(reader["saleType"]); | 335 | item.SaleType = Convert.ToByte(reader["saleType"]); |
336 | item.CreationDate = (int) reader["creationDate"]; | 336 | item.CreationDate = (int) reader["creationDate"]; |
337 | item.GroupID = new LLUUID(reader["groupID"].ToString()); | 337 | item.GroupID = new UUID(reader["groupID"].ToString()); |
338 | item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); | 338 | item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); |
339 | item.Flags = ConvertInt32BitFieldToUint32((int)reader["flags"]); | 339 | item.Flags = ConvertInt32BitFieldToUint32((int)reader["flags"]); |
340 | 340 | ||
@@ -353,7 +353,7 @@ namespace OpenSim.Data.MSSQL | |||
353 | /// </summary> | 353 | /// </summary> |
354 | /// <param name="item">The item to return</param> | 354 | /// <param name="item">The item to return</param> |
355 | /// <returns>An inventory item</returns> | 355 | /// <returns>An inventory item</returns> |
356 | public InventoryItemBase getInventoryItem(LLUUID itemID) | 356 | public InventoryItemBase getInventoryItem(UUID itemID) |
357 | { | 357 | { |
358 | try | 358 | try |
359 | { | 359 | { |
@@ -389,9 +389,9 @@ namespace OpenSim.Data.MSSQL | |||
389 | try | 389 | try |
390 | { | 390 | { |
391 | InventoryFolderBase folder = new InventoryFolderBase(); | 391 | InventoryFolderBase folder = new InventoryFolderBase(); |
392 | folder.Owner = new LLUUID((string) reader["agentID"]); | 392 | folder.Owner = new UUID((string) reader["agentID"]); |
393 | folder.ParentID = new LLUUID((string) reader["parentFolderID"]); | 393 | folder.ParentID = new UUID((string) reader["parentFolderID"]); |
394 | folder.ID = new LLUUID((string) reader["folderID"]); | 394 | folder.ID = new UUID((string) reader["folderID"]); |
395 | folder.Name = (string) reader["folderName"]; | 395 | folder.Name = (string) reader["folderName"]; |
396 | folder.Type = (short) reader["type"]; | 396 | folder.Type = (short) reader["type"]; |
397 | folder.Version = Convert.ToUInt16(reader["version"]); | 397 | folder.Version = Convert.ToUInt16(reader["version"]); |
@@ -410,7 +410,7 @@ namespace OpenSim.Data.MSSQL | |||
410 | /// </summary> | 410 | /// </summary> |
411 | /// <param name="folder">The folder to return</param> | 411 | /// <param name="folder">The folder to return</param> |
412 | /// <returns>A folder class</returns> | 412 | /// <returns>A folder class</returns> |
413 | public InventoryFolderBase getInventoryFolder(LLUUID folderID) | 413 | public InventoryFolderBase getInventoryFolder(UUID folderID) |
414 | { | 414 | { |
415 | try | 415 | try |
416 | { | 416 | { |
@@ -556,7 +556,7 @@ namespace OpenSim.Data.MSSQL | |||
556 | /// Delete an item in inventory database | 556 | /// Delete an item in inventory database |
557 | /// </summary> | 557 | /// </summary> |
558 | /// <param name="item">the item UUID</param> | 558 | /// <param name="item">the item UUID</param> |
559 | public void deleteInventoryItem(LLUUID itemID) | 559 | public void deleteInventoryItem(UUID itemID) |
560 | { | 560 | { |
561 | try | 561 | try |
562 | { | 562 | { |
@@ -679,7 +679,7 @@ namespace OpenSim.Data.MSSQL | |||
679 | /// </summary> | 679 | /// </summary> |
680 | /// <param name="folders">list where folders will be appended</param> | 680 | /// <param name="folders">list where folders will be appended</param> |
681 | /// <param name="parentID">ID of parent</param> | 681 | /// <param name="parentID">ID of parent</param> |
682 | protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) | 682 | protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID) |
683 | { | 683 | { |
684 | List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID); | 684 | List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID); |
685 | 685 | ||
@@ -688,7 +688,7 @@ namespace OpenSim.Data.MSSQL | |||
688 | } | 688 | } |
689 | 689 | ||
690 | // See IInventoryDataPlugin | 690 | // See IInventoryDataPlugin |
691 | public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) | 691 | public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) |
692 | { | 692 | { |
693 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); | 693 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); |
694 | getInventoryFolders(ref folders, parentID); | 694 | getInventoryFolders(ref folders, parentID); |
@@ -703,7 +703,7 @@ namespace OpenSim.Data.MSSQL | |||
703 | /// Delete a folder in inventory databasae | 703 | /// Delete a folder in inventory databasae |
704 | /// </summary> | 704 | /// </summary> |
705 | /// <param name="folderID">the folder UUID</param> | 705 | /// <param name="folderID">the folder UUID</param> |
706 | protected void deleteOneFolder(LLUUID folderID) | 706 | protected void deleteOneFolder(UUID folderID) |
707 | { | 707 | { |
708 | try | 708 | try |
709 | { | 709 | { |
@@ -725,7 +725,7 @@ namespace OpenSim.Data.MSSQL | |||
725 | /// Delete an item in inventory database | 725 | /// Delete an item in inventory database |
726 | /// </summary> | 726 | /// </summary> |
727 | /// <param name="folderID">the item ID</param> | 727 | /// <param name="folderID">the item ID</param> |
728 | protected void deleteItemsInFolder(LLUUID folderID) | 728 | protected void deleteItemsInFolder(UUID folderID) |
729 | { | 729 | { |
730 | try | 730 | try |
731 | { | 731 | { |
@@ -749,7 +749,7 @@ namespace OpenSim.Data.MSSQL | |||
749 | /// Delete an inventory folder | 749 | /// Delete an inventory folder |
750 | /// </summary> | 750 | /// </summary> |
751 | /// <param name="folderId">Id of folder to delete</param> | 751 | /// <param name="folderId">Id of folder to delete</param> |
752 | public void deleteInventoryFolder(LLUUID folderID) | 752 | public void deleteInventoryFolder(UUID folderID) |
753 | { | 753 | { |
754 | // lock (database) | 754 | // lock (database) |
755 | { | 755 | { |