diff options
author | Justin Clarke Casey | 2008-04-11 18:19:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-11 18:19:21 +0000 |
commit | 649f304e764784d08f8a79729f70f66972c52c56 (patch) | |
tree | 54c0c4e43e5bdd70e860fc7338a68711770f1e4a /OpenSim/Region | |
parent | * Change inventory async response deliver to deliver all items and folders at... (diff) | |
download | opensim-SC-649f304e764784d08f8a79729f70f66972c52c56.zip opensim-SC-649f304e764784d08f8a79729f70f66972c52c56.tar.gz opensim-SC-649f304e764784d08f8a79729f70f66972c52c56.tar.bz2 opensim-SC-649f304e764784d08f8a79729f70f66972c52c56.tar.xz |
* Minor inventory code cleanup following on from last patch
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalInventoryService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 13cb6de..e81a39f 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -52,7 +52,6 @@ namespace OpenSim.Region.Communications.Local | |||
52 | { | 52 | { |
53 | if (folder.ParentID == LLUUID.Zero) | 53 | if (folder.ParentID == LLUUID.Zero) |
54 | { | 54 | { |
55 | //rootFolder = RequestInventoryFolder(userID, folder, callback); | ||
56 | rootFolder = new InventoryFolderImpl(folder); | 55 | rootFolder = new InventoryFolderImpl(folder); |
57 | folders.Add(rootFolder); | 56 | folders.Add(rootFolder); |
58 | } | 57 | } |
@@ -64,7 +63,6 @@ namespace OpenSim.Region.Communications.Local | |||
64 | { | 63 | { |
65 | if (folder.ID != rootFolder.ID) | 64 | if (folder.ID != rootFolder.ID) |
66 | { | 65 | { |
67 | //RequestInventoryFolder(userID, folder, callback); | ||
68 | folders.Add(new InventoryFolderImpl(folder)); | 66 | folders.Add(new InventoryFolderImpl(folder)); |
69 | } | 67 | } |
70 | } | 68 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index f31127f..dc26ce2 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -114,7 +114,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
114 | { | 114 | { |
115 | rootFolder = new InventoryFolderImpl(folder); | 115 | rootFolder = new InventoryFolderImpl(folder); |
116 | folders.Add(rootFolder); | 116 | folders.Add(rootFolder); |
117 | //request.FolderCallBack(userID, newfolder); | ||
118 | } | 117 | } |
119 | } | 118 | } |
120 | 119 | ||
@@ -125,14 +124,12 @@ namespace OpenSim.Region.Communications.OGS1 | |||
125 | if (folder.ID != rootFolder.ID) | 124 | if (folder.ID != rootFolder.ID) |
126 | { | 125 | { |
127 | folders.Add(new InventoryFolderImpl(folder)); | 126 | folders.Add(new InventoryFolderImpl(folder)); |
128 | //request.FolderCallBack(userID, newfolder); | ||
129 | } | 127 | } |
130 | } | 128 | } |
131 | 129 | ||
132 | foreach (InventoryItemBase item in response.AllItems) | 130 | foreach (InventoryItemBase item in response.AllItems) |
133 | { | 131 | { |
134 | items.Add(item); | 132 | items.Add(item); |
135 | //request.ItemCallBack(userID, item); | ||
136 | } | 133 | } |
137 | } | 134 | } |
138 | 135 | ||
@@ -237,14 +234,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
237 | { | 234 | { |
238 | public LLUUID UserID; | 235 | public LLUUID UserID; |
239 | public InventoryReceiptCallback Callback; | 236 | public InventoryReceiptCallback Callback; |
240 | //public InventoryFolderInfo FolderCallBack; | ||
241 | //public InventoryItemInfo ItemCallBack; | ||
242 | 237 | ||
243 | public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback) | 238 | public InventoryRequest(LLUUID userId, InventoryReceiptCallback callback) |
244 | { | 239 | { |
245 | UserID = userId; | 240 | UserID = userId; |
246 | //FolderCallBack = folderCall; | ||
247 | //ItemCallBack = itemCall; | ||
248 | Callback = callback; | 241 | Callback = callback; |
249 | } | 242 | } |
250 | } | 243 | } |