From 5ee75998ce4d941efd937848d28f3a4dac6ba6cc Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 7 Apr 2008 23:27:05 +0000 Subject: more refactoring, this time on InventoryFolderBase * wrap attributes in properties * clean up names a little bit * clean up name styles --- OpenSim/Region/ClientStack/ClientView.cs | 8 ++++---- .../Region/Communications/Local/LocalInventoryService.cs | 6 +++--- OpenSim/Region/Communications/Local/LocalLoginService.cs | 14 +++++++------- OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 4 ++-- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 4325b93..8391e0a 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -1307,10 +1307,10 @@ namespace OpenSim.Region.ClientStack foreach (InventoryFolderBase folder in folders) { descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock(); - descend.FolderData[i].FolderID = folder.folderID; - descend.FolderData[i].Name = Helpers.StringToField(folder.name); - descend.FolderData[i].ParentID = folder.parentID; - descend.FolderData[i].Type = (sbyte) folder.type; + descend.FolderData[i].FolderID = folder.ID; + descend.FolderData[i].Name = Helpers.StringToField(folder.Name); + descend.FolderData[i].ParentID = folder.ParentID; + descend.FolderData[i].Type = (sbyte) folder.Type; i++; count++; diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index df735a9..bb3db9d 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs @@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local //need to make sure we send root folder first foreach (InventoryFolderBase folder in folders) { - if (folder.parentID == LLUUID.Zero) + if (folder.ParentID == LLUUID.Zero) { rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); } @@ -59,7 +59,7 @@ namespace OpenSim.Region.Communications.Local { foreach (InventoryFolderBase folder in folders) { - if (folder.folderID != rootFolder.folderID) + if (folder.ID != rootFolder.ID) { RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); } @@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.Local InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); folderCallBack(userID, newFolder); - List items = RequestFolderItems(newFolder.folderID); + List items = RequestFolderItems(newFolder.ID); foreach (InventoryItemBase item in items) { itemCallBack(userID, item); diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 8583e61..4632716 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -229,16 +229,16 @@ namespace OpenSim.Region.Communications.Local Hashtable TempHash; foreach (InventoryFolderBase InvFolder in folders) { - if (InvFolder.parentID == LLUUID.Zero) + if (InvFolder.ParentID == LLUUID.Zero) { - rootID = InvFolder.folderID; + rootID = InvFolder.ID; } TempHash = new Hashtable(); - TempHash["name"] = InvFolder.name; - TempHash["parent_id"] = InvFolder.parentID.ToString(); - TempHash["version"] = (Int32) InvFolder.version; - TempHash["type_default"] = (Int32) InvFolder.type; - TempHash["folder_id"] = InvFolder.folderID.ToString(); + TempHash["name"] = InvFolder.Name; + TempHash["parent_id"] = InvFolder.ParentID.ToString(); + TempHash["version"] = (Int32) InvFolder.Version; + TempHash["type_default"] = (Int32) InvFolder.Type; + TempHash["folder_id"] = InvFolder.ID.ToString(); AgentInventoryArray.Add(TempHash); } diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index ba2e3d7..3a13f71 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs @@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.OGS1 InventoryRequest request = m_RequestingInventory[userID]; foreach (InventoryFolderBase folder in response.Folders) { - if (folder.parentID == LLUUID.Zero) + if (folder.ParentID == LLUUID.Zero) { InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); rootFolder = newfolder; @@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1 { foreach (InventoryFolderBase folder in response.Folders) { - if (folder.folderID != rootFolder.folderID) + if (folder.ID != rootFolder.ID) { InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); request.FolderCallBack(userID, newfolder); diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 052cb02..87f7ace 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -327,7 +327,7 @@ namespace OpenSim.Region.Environment.Scenes itemCopy.Name = item.Name; itemCopy.AssetType = item.AssetType; itemCopy.InvType = item.InvType; - itemCopy.Folder = recipientUserInfo.RootFolder.folderID; + itemCopy.Folder = recipientUserInfo.RootFolder.ID; itemCopy.CurrentPermissions = 2147483647; itemCopy.NextPermissions = 2147483647; itemCopy.EveryOnePermissions = item.EveryOnePermissions; -- cgit v1.1