diff options
author | Sean Dague | 2008-04-07 23:27:05 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-07 23:27:05 +0000 |
commit | 5ee75998ce4d941efd937848d28f3a4dac6ba6cc (patch) | |
tree | f29a100cb8ab3715c82f0aec4fee9f968f210405 /OpenSim/Region/Communications | |
parent | Refactor InventoryItemBase to do the following: (diff) | |
download | opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.zip opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.gz opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.bz2 opensim-SC_OLD-5ee75998ce4d941efd937848d28f3a4dac6ba6cc.tar.xz |
more refactoring, this time on InventoryFolderBase
* wrap attributes in properties
* clean up names a little bit
* clean up name styles
Diffstat (limited to '')
3 files changed, 12 insertions, 12 deletions
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 | |||
49 | //need to make sure we send root folder first | 49 | //need to make sure we send root folder first |
50 | foreach (InventoryFolderBase folder in folders) | 50 | foreach (InventoryFolderBase folder in folders) |
51 | { | 51 | { |
52 | if (folder.parentID == LLUUID.Zero) | 52 | if (folder.ParentID == LLUUID.Zero) |
53 | { | 53 | { |
54 | rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); | 54 | rootFolder = RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); |
55 | } | 55 | } |
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Communications.Local | |||
59 | { | 59 | { |
60 | foreach (InventoryFolderBase folder in folders) | 60 | foreach (InventoryFolderBase folder in folders) |
61 | { | 61 | { |
62 | if (folder.folderID != rootFolder.folderID) | 62 | if (folder.ID != rootFolder.ID) |
63 | { | 63 | { |
64 | RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); | 64 | RequestInventoryFolder(userID, folder, folderCallBack, itemCallBack); |
65 | } | 65 | } |
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.Local | |||
112 | InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); | 112 | InventoryFolderImpl newFolder = new InventoryFolderImpl(folder); |
113 | folderCallBack(userID, newFolder); | 113 | folderCallBack(userID, newFolder); |
114 | 114 | ||
115 | List<InventoryItemBase> items = RequestFolderItems(newFolder.folderID); | 115 | List<InventoryItemBase> items = RequestFolderItems(newFolder.ID); |
116 | foreach (InventoryItemBase item in items) | 116 | foreach (InventoryItemBase item in items) |
117 | { | 117 | { |
118 | itemCallBack(userID, item); | 118 | 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 | |||
229 | Hashtable TempHash; | 229 | Hashtable TempHash; |
230 | foreach (InventoryFolderBase InvFolder in folders) | 230 | foreach (InventoryFolderBase InvFolder in folders) |
231 | { | 231 | { |
232 | if (InvFolder.parentID == LLUUID.Zero) | 232 | if (InvFolder.ParentID == LLUUID.Zero) |
233 | { | 233 | { |
234 | rootID = InvFolder.folderID; | 234 | rootID = InvFolder.ID; |
235 | } | 235 | } |
236 | TempHash = new Hashtable(); | 236 | TempHash = new Hashtable(); |
237 | TempHash["name"] = InvFolder.name; | 237 | TempHash["name"] = InvFolder.Name; |
238 | TempHash["parent_id"] = InvFolder.parentID.ToString(); | 238 | TempHash["parent_id"] = InvFolder.ParentID.ToString(); |
239 | TempHash["version"] = (Int32) InvFolder.version; | 239 | TempHash["version"] = (Int32) InvFolder.Version; |
240 | TempHash["type_default"] = (Int32) InvFolder.type; | 240 | TempHash["type_default"] = (Int32) InvFolder.Type; |
241 | TempHash["folder_id"] = InvFolder.folderID.ToString(); | 241 | TempHash["folder_id"] = InvFolder.ID.ToString(); |
242 | AgentInventoryArray.Add(TempHash); | 242 | AgentInventoryArray.Add(TempHash); |
243 | } | 243 | } |
244 | 244 | ||
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 | |||
107 | InventoryRequest request = m_RequestingInventory[userID]; | 107 | InventoryRequest request = m_RequestingInventory[userID]; |
108 | foreach (InventoryFolderBase folder in response.Folders) | 108 | foreach (InventoryFolderBase folder in response.Folders) |
109 | { | 109 | { |
110 | if (folder.parentID == LLUUID.Zero) | 110 | if (folder.ParentID == LLUUID.Zero) |
111 | { | 111 | { |
112 | InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); | 112 | InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); |
113 | rootFolder = newfolder; | 113 | rootFolder = newfolder; |
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
119 | { | 119 | { |
120 | foreach (InventoryFolderBase folder in response.Folders) | 120 | foreach (InventoryFolderBase folder in response.Folders) |
121 | { | 121 | { |
122 | if (folder.folderID != rootFolder.folderID) | 122 | if (folder.ID != rootFolder.ID) |
123 | { | 123 | { |
124 | InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); | 124 | InventoryFolderImpl newfolder = new InventoryFolderImpl(folder); |
125 | request.FolderCallBack(userID, newfolder); | 125 | request.FolderCallBack(userID, newfolder); |