Refactor InventoryItemBase to do the following:

 * wrap fields as Properties
 * rename some fields/properties to more sensible names
 * set style to PropName to match more standard C# approach

6 files changed, 142 insertions, 142 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 6af32a9..4325b93 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1219,25 +1219,25 @@ namespace OpenSim.Region.ClientStack
                 foreach (InventoryItemBase item in items)
                 {
                     descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
-                    descend.ItemData[i].ItemID = item.inventoryID;
-                    descend.ItemData[i].AssetID = item.assetID;
-                    descend.ItemData[i].CreatorID = item.creatorsID;
-                    descend.ItemData[i].BaseMask = item.inventoryBasePermissions;
+                    descend.ItemData[i].ItemID = item.ID;
+                    descend.ItemData[i].AssetID = item.AssetID;
+                    descend.ItemData[i].CreatorID = item.Creator;
+                    descend.ItemData[i].BaseMask = item.BasePermissions;
                     descend.ItemData[i].CreationDate = 1000;
-                    descend.ItemData[i].Description = Helpers.StringToField(item.inventoryDescription);
-                    descend.ItemData[i].EveryoneMask = item.inventoryEveryOnePermissions;
+                    descend.ItemData[i].Description = Helpers.StringToField(item.Description);
+                    descend.ItemData[i].EveryoneMask = item.EveryOnePermissions;
                     descend.ItemData[i].Flags = 1;
-                    descend.ItemData[i].FolderID = item.parentFolderID;
+                    descend.ItemData[i].FolderID = item.Folder;
                     descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
                     descend.ItemData[i].GroupMask = 0;
-                    descend.ItemData[i].InvType = (sbyte) item.invType;
-                    descend.ItemData[i].Name = Helpers.StringToField(item.inventoryName);
-                    descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions;
-                    descend.ItemData[i].OwnerID = item.avatarID;
-                    descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions;
+                    descend.ItemData[i].InvType = (sbyte) item.InvType;
+                    descend.ItemData[i].Name = Helpers.StringToField(item.Name);
+                    descend.ItemData[i].NextOwnerMask = item.NextPermissions;
+                    descend.ItemData[i].OwnerID = item.Owner;
+                    descend.ItemData[i].OwnerMask = item.CurrentPermissions;
                     descend.ItemData[i].SalePrice = 0;
                     descend.ItemData[i].SaleType = 0;
-                    descend.ItemData[i].Type = (sbyte) item.assetType;
+                    descend.ItemData[i].Type = (sbyte) item.AssetType;
                     descend.ItemData[i].CRC =
                         Helpers.InventoryCRC(descend.ItemData[i].CreationDate, descend.ItemData[i].SaleType,
                                              descend.ItemData[i].InvType, descend.ItemData[i].Type,
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.ClientStack
                                              descend.ItemData[i].ItemID, descend.ItemData[i].FolderID,
                                              descend.ItemData[i].EveryoneMask,
                                              descend.ItemData[i].Flags, descend.ItemData[i].OwnerMask,
-                                             descend.ItemData[i].GroupMask, item.inventoryCurrentPermissions);
+                                             descend.ItemData[i].GroupMask, item.CurrentPermissions);
 
                     i++;
                     count++;
@@ -1364,26 +1364,26 @@ namespace OpenSim.Region.ClientStack
             inventoryReply.AgentData.AgentID = AgentId;
             inventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
             inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
-            inventoryReply.InventoryData[0].ItemID = item.inventoryID;
-            inventoryReply.InventoryData[0].AssetID = item.assetID;
-            inventoryReply.InventoryData[0].CreatorID = item.creatorsID;
-            inventoryReply.InventoryData[0].BaseMask = item.inventoryBasePermissions;
+            inventoryReply.InventoryData[0].ItemID = item.ID;
+            inventoryReply.InventoryData[0].AssetID = item.AssetID;
+            inventoryReply.InventoryData[0].CreatorID = item.Creator;
+            inventoryReply.InventoryData[0].BaseMask = item.BasePermissions;
             inventoryReply.InventoryData[0].CreationDate =
                 (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-            inventoryReply.InventoryData[0].Description = Helpers.StringToField(item.inventoryDescription);
-            inventoryReply.InventoryData[0].EveryoneMask = item.inventoryEveryOnePermissions;
+            inventoryReply.InventoryData[0].Description = Helpers.StringToField(item.Description);
+            inventoryReply.InventoryData[0].EveryoneMask = item.EveryOnePermissions;
             inventoryReply.InventoryData[0].Flags = 0;
-            inventoryReply.InventoryData[0].FolderID = item.parentFolderID;
+            inventoryReply.InventoryData[0].FolderID = item.Folder;
             inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
             inventoryReply.InventoryData[0].GroupMask = 0;
-            inventoryReply.InventoryData[0].InvType = (sbyte)item.invType;
-            inventoryReply.InventoryData[0].Name = Helpers.StringToField(item.inventoryName);
-            inventoryReply.InventoryData[0].NextOwnerMask = item.inventoryNextPermissions;
-            inventoryReply.InventoryData[0].OwnerID = item.avatarID;
-            inventoryReply.InventoryData[0].OwnerMask = item.inventoryCurrentPermissions;
+            inventoryReply.InventoryData[0].InvType = (sbyte)item.InvType;
+            inventoryReply.InventoryData[0].Name = Helpers.StringToField(item.Name);
+            inventoryReply.InventoryData[0].NextOwnerMask = item.NextPermissions;
+            inventoryReply.InventoryData[0].OwnerID = item.Owner;
+            inventoryReply.InventoryData[0].OwnerMask = item.CurrentPermissions;
             inventoryReply.InventoryData[0].SalePrice = 0;
             inventoryReply.InventoryData[0].SaleType = 0;
-            inventoryReply.InventoryData[0].Type = (sbyte)item.assetType;
+            inventoryReply.InventoryData[0].Type = (sbyte)item.AssetType;
             inventoryReply.InventoryData[0].CRC =
                 Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType,
                                      inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID,
@@ -1416,25 +1416,25 @@ namespace OpenSim.Region.ClientStack
             
             bulkUpdate.ItemData = new BulkUpdateInventoryPacket.ItemDataBlock[1];
             bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock();            
-            bulkUpdate.ItemData[0].ItemID = item.inventoryID;
-            bulkUpdate.ItemData[0].AssetID = item.assetID;
-            bulkUpdate.ItemData[0].CreatorID = item.creatorsID;
-            bulkUpdate.ItemData[0].BaseMask = item.inventoryBasePermissions;
+            bulkUpdate.ItemData[0].ItemID = item.ID;
+            bulkUpdate.ItemData[0].AssetID = item.AssetID;
+            bulkUpdate.ItemData[0].CreatorID = item.Creator;
+            bulkUpdate.ItemData[0].BaseMask = item.BasePermissions;
             bulkUpdate.ItemData[0].CreationDate = 1000;
-            bulkUpdate.ItemData[0].Description = Helpers.StringToField(item.inventoryDescription);
-            bulkUpdate.ItemData[0].EveryoneMask = item.inventoryEveryOnePermissions;
+            bulkUpdate.ItemData[0].Description = Helpers.StringToField(item.Description);
+            bulkUpdate.ItemData[0].EveryoneMask = item.EveryOnePermissions;
             bulkUpdate.ItemData[0].Flags = 0;
-            bulkUpdate.ItemData[0].FolderID = item.parentFolderID;
+            bulkUpdate.ItemData[0].FolderID = item.Folder;
             bulkUpdate.ItemData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
             bulkUpdate.ItemData[0].GroupMask = 0;
-            bulkUpdate.ItemData[0].InvType = (sbyte)item.invType;
-            bulkUpdate.ItemData[0].Name = Helpers.StringToField(item.inventoryName);
-            bulkUpdate.ItemData[0].NextOwnerMask = item.inventoryNextPermissions;
-            bulkUpdate.ItemData[0].OwnerID = item.avatarID;
-            bulkUpdate.ItemData[0].OwnerMask = item.inventoryCurrentPermissions;
+            bulkUpdate.ItemData[0].InvType = (sbyte)item.InvType;
+            bulkUpdate.ItemData[0].Name = Helpers.StringToField(item.Name);
+            bulkUpdate.ItemData[0].NextOwnerMask = item.NextPermissions;
+            bulkUpdate.ItemData[0].OwnerID = item.Owner;
+            bulkUpdate.ItemData[0].OwnerMask = item.CurrentPermissions;
             bulkUpdate.ItemData[0].SalePrice = 100;
             bulkUpdate.ItemData[0].SaleType = 0;
-            bulkUpdate.ItemData[0].Type = (sbyte)item.assetType;
+            bulkUpdate.ItemData[0].Type = (sbyte)item.AssetType;
             bulkUpdate.ItemData[0].CRC =
                 Helpers.InventoryCRC(1000, 0, bulkUpdate.ItemData[0].InvType,
                                      bulkUpdate.ItemData[0].Type, bulkUpdate.ItemData[0].AssetID,
@@ -1461,25 +1461,25 @@ namespace OpenSim.Region.ClientStack
             InventoryReply.AgentData.SimApproved = true;
             InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
             InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
-            InventoryReply.InventoryData[0].ItemID = Item.inventoryID;
-            InventoryReply.InventoryData[0].AssetID = Item.assetID;
-            InventoryReply.InventoryData[0].CreatorID = Item.creatorsID;
-            InventoryReply.InventoryData[0].BaseMask = Item.inventoryBasePermissions;
+            InventoryReply.InventoryData[0].ItemID = Item.ID;
+            InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+            InventoryReply.InventoryData[0].CreatorID = Item.Creator;
+            InventoryReply.InventoryData[0].BaseMask = Item.BasePermissions;
             InventoryReply.InventoryData[0].CreationDate = 1000;
-            InventoryReply.InventoryData[0].Description = Helpers.StringToField(Item.inventoryDescription);
-            InventoryReply.InventoryData[0].EveryoneMask = Item.inventoryEveryOnePermissions;
+            InventoryReply.InventoryData[0].Description = Helpers.StringToField(Item.Description);
+            InventoryReply.InventoryData[0].EveryoneMask = Item.EveryOnePermissions;
             InventoryReply.InventoryData[0].Flags = 0;
-            InventoryReply.InventoryData[0].FolderID = Item.parentFolderID;
+            InventoryReply.InventoryData[0].FolderID = Item.Folder;
             InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
             InventoryReply.InventoryData[0].GroupMask = 0;
-            InventoryReply.InventoryData[0].InvType = (sbyte)Item.invType;
-            InventoryReply.InventoryData[0].Name = Helpers.StringToField(Item.inventoryName);
-            InventoryReply.InventoryData[0].NextOwnerMask = Item.inventoryNextPermissions;
-            InventoryReply.InventoryData[0].OwnerID = Item.avatarID;
-            InventoryReply.InventoryData[0].OwnerMask = Item.inventoryCurrentPermissions;
+            InventoryReply.InventoryData[0].InvType = (sbyte)Item.InvType;
+            InventoryReply.InventoryData[0].Name = Helpers.StringToField(Item.Name);
+            InventoryReply.InventoryData[0].NextOwnerMask = Item.NextPermissions;
+            InventoryReply.InventoryData[0].OwnerID = Item.Owner;
+            InventoryReply.InventoryData[0].OwnerMask = Item.CurrentPermissions;
             InventoryReply.InventoryData[0].SalePrice = 100;
             InventoryReply.InventoryData[0].SaleType = 0;
-            InventoryReply.InventoryData[0].Type = (sbyte)Item.assetType;
+            InventoryReply.InventoryData[0].Type = (sbyte)Item.AssetType;
             InventoryReply.InventoryData[0].CRC =
                 Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType,
                                      InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID,
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
index 0789b3c..7ae3eba 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Modules
         {
             m_log.DebugFormat(
                "[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}",
-                item.inventoryName);
+                item.Name);
 
             AgentAssetTransactions transactions
                 = GetUserTransactions(remoteClient.AgentId);
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs
index caba071..4d2ec5b 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Modules
                         
                         AssetBase asset
                             = m_userTransactions.Manager.MyScene.CommsManager.AssetCache.GetAsset(
-                                assetID, (item.assetType == (int) AssetType.Texture ? true : false));
+                                assetID, (item.AssetType == (int) AssetType.Texture ? true : false));
                         
                         if (asset == null)
                         {
@@ -351,11 +351,11 @@ namespace OpenSim.Region.Environment.Modules
 
                         if (asset != null && asset.FullID == assetID)
                         {
-                            asset.Name = item.inventoryName;
-                            asset.Description = item.inventoryDescription;
-                            asset.InvType = (sbyte) item.invType;
-                            asset.Type = (sbyte) item.assetType;
-                            item.assetID = asset.FullID;
+                            asset.Name = item.Name;
+                            asset.Description = item.Description;
+                            asset.InvType = (sbyte) item.InvType;
+                            asset.Type = (sbyte) item.AssetType;
+                            item.AssetID = asset.FullID;
 
                             m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset);
                         }      
@@ -374,18 +374,18 @@ namespace OpenSim.Region.Environment.Modules
                 if (userInfo != null)
                 {
                     InventoryItemBase item = new InventoryItemBase();
-                    item.avatarID = ourClient.AgentId;
-                    item.creatorsID = ourClient.AgentId;
-                    item.inventoryID = LLUUID.Random();
-                    item.assetID = Asset.FullID;
-                    item.inventoryDescription = m_description;
-                    item.inventoryName = m_name;
-                    item.assetType = type;
-                    item.invType = invType;
-                    item.parentFolderID = InventFolder;
-                    item.inventoryBasePermissions = 2147483647;
-                    item.inventoryCurrentPermissions = 2147483647;
-                    item.inventoryNextPermissions = nextPerm;
+                    item.Owner = ourClient.AgentId;
+                    item.Creator = ourClient.AgentId;
+                    item.ID = LLUUID.Random();
+                    item.AssetID = Asset.FullID;
+                    item.Description = m_description;
+                    item.Name = m_name;
+                    item.AssetType = type;
+                    item.InvType = invType;
+                    item.Folder = InventFolder;
+                    item.BasePermissions = 2147483647;
+                    item.CurrentPermissions = 2147483647;
+                    item.NextPermissions = nextPerm;
 
                     userInfo.AddItem(ourClient.AgentId, item);
                     ourClient.SendInventoryItemCreateUpdate(item);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 7ef3285..052cb02 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -114,19 +114,19 @@ namespace OpenSim.Region.Environment.Scenes
                     if (item != null)
                     {
                         AssetBase asset =
-                            CreateAsset(item.inventoryName, item.inventoryDescription, (sbyte) item.invType,
-                                        (sbyte) item.assetType, data);
+                            CreateAsset(item.Name, item.Description, (sbyte) item.InvType,
+                                        (sbyte) item.AssetType, data);
                         AssetCache.AddAsset(asset);
 
-                        item.assetID = asset.FullID;
+                        item.AssetID = asset.FullID;
                         userInfo.UpdateItem(remoteClient.AgentId, item);
 
                         // remoteClient.SendInventoryItemCreateUpdate(item);
-                        if ((InventoryType) item.invType == InventoryType.Notecard)
+                        if ((InventoryType) item.InvType == InventoryType.Notecard)
                         {
                             //do we want to know about updated note cards?
                         }
-                        else if ((InventoryType) item.invType == InventoryType.LSL)
+                        else if ((InventoryType) item.InvType == InventoryType.LSL)
                         {
                             // do we want to know about updated scripts
                         }
@@ -258,9 +258,9 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     if (LLUUID.Zero == transactionID)
                     {
-                        item.inventoryName = name;
-                        item.inventoryDescription = description;
-                        item.inventoryNextPermissions = nextOwnerMask;
+                        item.Name = name;
+                        item.Description = description;
+                        item.NextPermissions = nextOwnerMask;
 
                         userInfo.UpdateItem(remoteClient.AgentId, item);
                     }
@@ -319,20 +319,20 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         // Insert a copy of the item into the recipient                    
                         InventoryItemBase itemCopy = new InventoryItemBase();
-                        itemCopy.avatarID = recipientClient.AgentId;
-                        itemCopy.creatorsID = senderId;
-                        itemCopy.inventoryID = LLUUID.Random();
-                        itemCopy.assetID = item.assetID;
-                        itemCopy.inventoryDescription = item.inventoryDescription;
-                        itemCopy.inventoryName = item.inventoryName;
-                        itemCopy.assetType = item.assetType;
-                        itemCopy.invType = item.invType;
-                        itemCopy.parentFolderID = recipientUserInfo.RootFolder.folderID;
-                        itemCopy.inventoryCurrentPermissions = 2147483647;
-                        itemCopy.inventoryNextPermissions = 2147483647;
-                        itemCopy.inventoryEveryOnePermissions = item.inventoryEveryOnePermissions;
-                        itemCopy.inventoryBasePermissions = item.inventoryBasePermissions;
-                        itemCopy.inventoryCurrentPermissions = item.inventoryCurrentPermissions;
+                        itemCopy.Owner = recipientClient.AgentId;
+                        itemCopy.Creator = senderId;
+                        itemCopy.ID = LLUUID.Random();
+                        itemCopy.AssetID = item.AssetID;
+                        itemCopy.Description = item.Description;
+                        itemCopy.Name = item.Name;
+                        itemCopy.AssetType = item.AssetType;
+                        itemCopy.InvType = item.InvType;
+                        itemCopy.Folder = recipientUserInfo.RootFolder.folderID;
+                        itemCopy.CurrentPermissions = 2147483647;
+                        itemCopy.NextPermissions = 2147483647;
+                        itemCopy.EveryOnePermissions = item.EveryOnePermissions;
+                        itemCopy.BasePermissions = item.BasePermissions;
+                        itemCopy.CurrentPermissions = item.CurrentPermissions;
 
                         recipientUserInfo.AddItem(recipientClient.AgentId, itemCopy);
                         
@@ -343,8 +343,8 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         m_log.ErrorFormat(
                             "[AGENT INVENTORY]: Could not find userinfo for recipient user {0}, {1} of item {2}, {3} from {4}", 
-                            recipientClient.Name, recipientClient.AgentId, item.inventoryName, 
-                            item.inventoryID, senderId);
+                            recipientClient.Name, recipientClient.AgentId, item.Name, 
+                            item.ID, senderId);
                     }
                 }
                 else
@@ -397,19 +397,19 @@ namespace OpenSim.Region.Environment.Scenes
             
             AssetBase asset 
                 = AssetCache.GetAsset(
-                    item.assetID, (item.assetType == (int)AssetType.Texture ? true : false));
+                    item.AssetID, (item.AssetType == (int)AssetType.Texture ? true : false));
 
             if (asset != null)
             {
                 // TODO: preserve current permissions?
                 CreateNewInventoryItem(
-                    remoteClient, newFolderID, callbackID, asset, item.inventoryNextPermissions);
+                    remoteClient, newFolderID, callbackID, asset, item.NextPermissions);
             }
             else
             {
                 m_log.ErrorFormat(
                     "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found",
-                    item.inventoryName, item.assetID);                
+                    item.Name, item.AssetID);                
             }
         }
 
@@ -445,9 +445,9 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     if (newName != System.String.Empty)
                     {
-                        item.inventoryName = newName;
+                        item.Name = newName;
                     }
-                    item.parentFolderID = folderID;
+                    item.Folder = folderID;
                     userInfo.DeleteItem(remoteClient.AgentId, item);
 
                     // TODO: preserve current permissions?
@@ -483,17 +483,17 @@ namespace OpenSim.Region.Environment.Scenes
             if (userInfo != null)
             {
                 InventoryItemBase item = new InventoryItemBase();
-                item.avatarID = remoteClient.AgentId;
-                item.creatorsID = remoteClient.AgentId;
-                item.inventoryID = LLUUID.Random();
-                item.assetID = asset.FullID;
-                item.inventoryDescription = asset.Description;
-                item.inventoryName = asset.Name;
-                item.assetType = asset.Type;
-                item.invType = asset.InvType;
-                item.parentFolderID = folderID;
-                item.inventoryCurrentPermissions = 2147483647;
-                item.inventoryNextPermissions = nextOwnerMask;
+                item.Owner = remoteClient.AgentId;
+                item.Creator = remoteClient.AgentId;
+                item.ID = LLUUID.Random();
+                item.AssetID = asset.FullID;
+                item.Description = asset.Description;
+                item.Name = asset.Name;
+                item.AssetType = asset.Type;
+                item.InvType = asset.InvType;
+                item.Folder = folderID;
+                item.CurrentPermissions = 2147483647;
+                item.NextPermissions = nextOwnerMask;
 
                 userInfo.AddItem(remoteClient.AgentId, item);
                 remoteClient.SendInventoryItemCreateUpdate(item);
@@ -708,12 +708,12 @@ namespace OpenSim.Region.Environment.Scenes
 
                         if (item != null)
                         {
-                            if (item.assetType == 0 || item.assetType == 1 || item.assetType == 10)
+                            if (item.AssetType == 0 || item.AssetType == 1 || item.AssetType == 10)
                             {
                                 group.AddInventoryItem(remoteClient, primLocalID, item, copyID);
                                 m_log.InfoFormat(
                                     "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", 
-                                    item.inventoryName, primLocalID, remoteClient.Name);
+                                    item.Name, primLocalID, remoteClient.Name);
                                 group.GetProperties(remoteClient);
                             }
                             else
@@ -725,7 +725,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 // nasty way it is done to be changed).
                                 m_log.WarnFormat(
                                     "[PRIM INVENTORY]: Sorry, prim inventory storage of asset type {0} is not yet supported", 
-                                    item.assetType);
+                                    item.AssetType);
                             }
                         }
                         else
@@ -790,7 +790,7 @@ namespace OpenSim.Region.Environment.Scenes
                                 "[PRIM INVENTORY]: " +
                                 "Could not rez script {0} into prim local ID {1} for user {2}"
                                 + " because the prim could not be found in the region!",
-                                item.inventoryName, localID, remoteClient.Name);
+                                item.Name, localID, remoteClient.Name);
                         }
                     }
                     else
@@ -863,21 +863,21 @@ namespace OpenSim.Region.Environment.Scenes
                                 AssetCache.AddAsset(asset);
 
                                 InventoryItemBase item = new InventoryItemBase();
-                                item.avatarID = remoteClient.AgentId;
-                                item.creatorsID = remoteClient.AgentId;
-                                item.inventoryID = LLUUID.Random();
-                                item.assetID = asset.FullID;
-                                item.inventoryDescription = asset.Description;
-                                item.inventoryName = asset.Name;
-                                item.assetType = asset.Type;
-                                item.invType = asset.InvType;
-                                item.parentFolderID = DeRezPacket.AgentBlock.DestinationID;
-                                item.inventoryCurrentPermissions = 2147483647;
-                                item.inventoryNextPermissions = 2147483647;
-                                item.inventoryEveryOnePermissions =
+                                item.Owner = remoteClient.AgentId;
+                                item.Creator = remoteClient.AgentId;
+                                item.ID = LLUUID.Random();
+                                item.AssetID = asset.FullID;
+                                item.Description = asset.Description;
+                                item.Name = asset.Name;
+                                item.AssetType = asset.Type;
+                                item.InvType = asset.InvType;
+                                item.Folder = DeRezPacket.AgentBlock.DestinationID;
+                                item.CurrentPermissions = 2147483647;
+                                item.NextPermissions = 2147483647;
+                                item.EveryOnePermissions =
                                     ((SceneObjectGroup) selectedEnt).RootPart.EveryoneMask;
-                                item.inventoryBasePermissions = ((SceneObjectGroup) selectedEnt).RootPart.BaseMask;
-                                item.inventoryCurrentPermissions = ((SceneObjectGroup) selectedEnt).RootPart.OwnerMask;
+                                item.BasePermissions = ((SceneObjectGroup) selectedEnt).RootPart.BaseMask;
+                                item.CurrentPermissions = ((SceneObjectGroup) selectedEnt).RootPart.OwnerMask;
 
                                 userInfo.AddItem(remoteClient.AgentId, item);
                                 remoteClient.SendInventoryItemCreateUpdate(item);
@@ -942,7 +942,7 @@ namespace OpenSim.Region.Environment.Scenes
                     InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
                     if (item != null)
                     {
-                        AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false);
+                        AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false);
 
                         if (rezAsset != null)
                         {
@@ -956,8 +956,8 @@ namespace OpenSim.Region.Environment.Scenes
                             // Since renaming the item in the inventory does not affect the name stored
                             // in the serialization, transfer the correct name from the inventory to the
                             // object itself before we rez.
-                            rootPart.Name = item.inventoryName;
-                            rootPart.Description = item.inventoryDescription;
+                            rootPart.Name = item.Name;
+                            rootPart.Description = item.Description;
                             
                             rootPart.TrimPermissions();
                             group.ApplyPhysics(m_physicalPrim);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index a450a3d..3f14fff 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Environment.Scenes
         public bool AddInventoryItem(IClientAPI remoteClient, uint localID, 
                                      InventoryItemBase item, LLUUID copyItemID)
         {
-            LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.inventoryID;
+            LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.ID;
 
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
@@ -186,13 +186,13 @@ namespace OpenSim.Region.Environment.Scenes
                 TaskInventoryItem taskItem = new TaskInventoryItem();
                 
                 taskItem.ItemID = newItemId;                
-                taskItem.AssetID = item.assetID;
-                taskItem.Name = item.inventoryName;
-                taskItem.Description = item.inventoryDescription;
-                taskItem.OwnerID = item.avatarID;
-                taskItem.CreatorID = item.creatorsID;
-                taskItem.Type = item.assetType;
-                taskItem.InvType = item.invType;
+                taskItem.AssetID = item.AssetID;
+                taskItem.Name = item.Name;
+                taskItem.Description = item.Description;
+                taskItem.OwnerID = item.Owner;
+                taskItem.CreatorID = item.Creator;
+                taskItem.Type = item.AssetType;
+                taskItem.InvType = item.InvType;
                 part.AddInventoryItem(taskItem);
                 
                 return true;
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index f413fb9..ae522ef 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -303,7 +303,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
                                     InventoryItemBase baseItem = profile.RootFolder.HasItem(wear.ItemID);
                                     if (baseItem != null)
                                     {
-                                        assetId = baseItem.assetID;
+                                        assetId = baseItem.AssetID;
                                         avatAppearance.Wearables[wear.Type].AssetID = assetId;
                                         avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;