aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-06-08 15:52:26 -0700
committerDiva Canto2010-06-08 15:52:26 -0700
commit5c0068723fbf0523c31b0c20c1aa456d549bf8dc (patch)
tree1137e1db9e617a74e17b6c71357ad191c01bbf26
parent* Changed CreatorIDs consistently to varchar(128) (diff)
downloadopensim-SC_OLD-5c0068723fbf0523c31b0c20c1aa456d549bf8dc.zip
opensim-SC_OLD-5c0068723fbf0523c31b0c20c1aa456d549bf8dc.tar.gz
opensim-SC_OLD-5c0068723fbf0523c31b0c20c1aa456d549bf8dc.tar.bz2
opensim-SC_OLD-5c0068723fbf0523c31b0c20c1aa456d549bf8dc.tar.xz
Changed XInventoryData's CreatorID to a string.
-rw-r--r--OpenSim/Data/IXInventoryData.cs2
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
index 6909136..d85a7ef 100644
--- a/OpenSim/Data/IXInventoryData.cs
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Data
51 public int inventoryNextPermissions; 51 public int inventoryNextPermissions;
52 public int inventoryCurrentPermissions; 52 public int inventoryCurrentPermissions;
53 public int invType; 53 public int invType;
54 public UUID creatorID; 54 public string creatorID;
55 public int inventoryBasePermissions; 55 public int inventoryBasePermissions;
56 public int inventoryEveryOnePermissions; 56 public int inventoryEveryOnePermissions;
57 public int salePrice; 57 public int salePrice;
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 974caf0..af831fd 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -460,7 +460,7 @@ namespace OpenSim.Services.InventoryService
460 newItem.ID = item.inventoryID; 460 newItem.ID = item.inventoryID;
461 newItem.InvType = item.invType; 461 newItem.InvType = item.invType;
462 newItem.Folder = item.parentFolderID; 462 newItem.Folder = item.parentFolderID;
463 newItem.CreatorId = item.creatorID.ToString(); 463 newItem.CreatorId = item.creatorID;
464 newItem.Description = item.inventoryDescription; 464 newItem.Description = item.inventoryDescription;
465 newItem.NextPermissions = (uint)item.inventoryNextPermissions; 465 newItem.NextPermissions = (uint)item.inventoryNextPermissions;
466 newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions; 466 newItem.CurrentPermissions = (uint)item.inventoryCurrentPermissions;
@@ -491,7 +491,7 @@ namespace OpenSim.Services.InventoryService
491 newItem.inventoryID = item.ID; 491 newItem.inventoryID = item.ID;
492 newItem.invType = item.InvType; 492 newItem.invType = item.InvType;
493 newItem.parentFolderID = item.Folder; 493 newItem.parentFolderID = item.Folder;
494 newItem.creatorID = item.CreatorIdAsUuid; 494 newItem.creatorID = item.CreatorId;
495 newItem.inventoryDescription = item.Description; 495 newItem.inventoryDescription = item.Description;
496 newItem.inventoryNextPermissions = (int)item.NextPermissions; 496 newItem.inventoryNextPermissions = (int)item.NextPermissions;
497 newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions; 497 newItem.inventoryCurrentPermissions = (int)item.CurrentPermissions;