diff options
author | Sean Dague | 2007-10-05 15:45:45 +0000 |
---|---|---|
committer | Sean Dague | 2007-10-05 15:45:45 +0000 |
commit | c3d8f1f4253f72484100394940e62f2912cbc4ff (patch) | |
tree | 8a9f237ed3c1140b4059ec121e0d4ede82eae416 /OpenSim/Region/Communications/Local/LocalInventoryService.cs | |
parent | * So, ok, maybe renaming serialized fields on a friday wasn't the smartest of... (diff) | |
download | opensim-SC-c3d8f1f4253f72484100394940e62f2912cbc4ff.zip opensim-SC-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.gz opensim-SC-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.bz2 opensim-SC-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.xz |
getting all our line endings consistant again
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalInventoryService.cs')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalInventoryService.cs | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index dc91663..1f5b298 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -1,67 +1,67 @@ | |||
1 | using System.Collections.Generic; | 1 | using System.Collections.Generic; |
2 | using libsecondlife; | 2 | using libsecondlife; |
3 | using OpenSim.Framework.Communications; | 3 | using OpenSim.Framework.Communications; |
4 | using OpenSim.Framework.Types; | 4 | using OpenSim.Framework.Types; |
5 | using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; | 5 | using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; |
6 | 6 | ||
7 | namespace OpenSim.Region.Communications.Local | 7 | namespace OpenSim.Region.Communications.Local |
8 | { | 8 | { |
9 | public class LocalInventoryService : InventoryServiceBase | 9 | public class LocalInventoryService : InventoryServiceBase |
10 | { | 10 | { |
11 | 11 | ||
12 | public LocalInventoryService() | 12 | public LocalInventoryService() |
13 | { | 13 | { |
14 | 14 | ||
15 | } | 15 | } |
16 | 16 | ||
17 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) | 17 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) |
18 | { | 18 | { |
19 | List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); | 19 | List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); |
20 | InventoryFolder rootFolder = null; | 20 | InventoryFolder rootFolder = null; |
21 | 21 | ||
22 | //need to make sure we send root folder first | 22 | //need to make sure we send root folder first |
23 | foreach (InventoryFolderBase folder in folders) | 23 | foreach (InventoryFolderBase folder in folders) |
24 | { | 24 | { |
25 | if (folder.parentID == libsecondlife.LLUUID.Zero) | 25 | if (folder.parentID == libsecondlife.LLUUID.Zero) |
26 | { | 26 | { |
27 | InventoryFolder newfolder = new InventoryFolder(folder); | 27 | InventoryFolder newfolder = new InventoryFolder(folder); |
28 | rootFolder = newfolder; | 28 | rootFolder = newfolder; |
29 | folderCallBack(userID, newfolder); | 29 | folderCallBack(userID, newfolder); |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | if (rootFolder != null) | 33 | if (rootFolder != null) |
34 | { | 34 | { |
35 | foreach (InventoryFolderBase folder in folders) | 35 | foreach (InventoryFolderBase folder in folders) |
36 | { | 36 | { |
37 | if (folder.folderID != rootFolder.folderID) | 37 | if (folder.folderID != rootFolder.folderID) |
38 | { | 38 | { |
39 | InventoryFolder newfolder = new InventoryFolder(folder); | 39 | InventoryFolder newfolder = new InventoryFolder(folder); |
40 | folderCallBack(userID, newfolder); | 40 | folderCallBack(userID, newfolder); |
41 | 41 | ||
42 | List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); | 42 | List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); |
43 | foreach (InventoryItemBase item in items) | 43 | foreach (InventoryItemBase item in items) |
44 | { | 44 | { |
45 | itemCallBack(userID, item); | 45 | itemCallBack(userID, item); |
46 | } | 46 | } |
47 | } | 47 | } |
48 | } | 48 | } |
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) | 52 | public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) |
53 | { | 53 | { |
54 | this.AddFolder(folder); | 54 | this.AddFolder(folder); |
55 | } | 55 | } |
56 | 56 | ||
57 | public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) | 57 | public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) |
58 | { | 58 | { |
59 | this.AddItem(item); | 59 | this.AddItem(item); |
60 | } | 60 | } |
61 | 61 | ||
62 | public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) | 62 | public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) |
63 | { | 63 | { |
64 | this.deleteItem(item); | 64 | this.deleteItem(item); |
65 | } | 65 | } |
66 | } | 66 | } |
67 | } | 67 | } |