diff options
author | Jeff Ames | 2009-05-31 18:35:00 +0000 |
---|---|---|
committer | Jeff Ames | 2009-05-31 18:35:00 +0000 |
commit | 35b450d41d2695aa6a82a6d8e6bda5e327f431e1 (patch) | |
tree | 28028806a736a8f22b41ab0c7c8feec1f43fd0f9 /OpenSim/Region/Communications | |
parent | Update svn properties. (diff) | |
download | opensim-SC-35b450d41d2695aa6a82a6d8e6bda5e327f431e1.zip opensim-SC-35b450d41d2695aa6a82a6d8e6bda5e327f431e1.tar.gz opensim-SC-35b450d41d2695aa6a82a6d8e6bda5e327f431e1.tar.bz2 opensim-SC-35b450d41d2695aa6a82a6d8e6bda5e327f431e1.tar.xz |
Add copyright headers, formatting cleanup, ignore some generated files.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalInventoryService.cs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 4ff4e96..6fc2c6a 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -56,39 +56,39 @@ namespace OpenSim.Region.Communications.Local | |||
56 | if (skeletonFolders != null) | 56 | if (skeletonFolders != null) |
57 | { | 57 | { |
58 | 58 | ||
59 | InventoryFolderImpl rootFolder = null; | 59 | InventoryFolderImpl rootFolder = null; |
60 | 60 | ||
61 | // Need to retrieve the root folder on the first pass | 61 | // Need to retrieve the root folder on the first pass |
62 | foreach (InventoryFolderBase folder in skeletonFolders) | 62 | foreach (InventoryFolderBase folder in skeletonFolders) |
63 | { | 63 | { |
64 | if (folder.ParentID == UUID.Zero) | 64 | if (folder.ParentID == UUID.Zero) |
65 | { | 65 | { |
66 | rootFolder = new InventoryFolderImpl(folder); | 66 | rootFolder = new InventoryFolderImpl(folder); |
67 | folders.Add(rootFolder); | 67 | folders.Add(rootFolder); |
68 | items.AddRange(RequestFolderItems(rootFolder.ID)); | 68 | items.AddRange(RequestFolderItems(rootFolder.ID)); |
69 | break; // Only 1 root folder per user | 69 | break; // Only 1 root folder per user |
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | ||
73 | if (rootFolder != null) | 73 | if (rootFolder != null) |
74 | { | 74 | { |
75 | foreach (InventoryFolderBase folder in skeletonFolders) | 75 | foreach (InventoryFolderBase folder in skeletonFolders) |
76 | { | 76 | { |
77 | if (folder.ID != rootFolder.ID) | 77 | if (folder.ID != rootFolder.ID) |
78 | { | 78 | { |
79 | folders.Add(new InventoryFolderImpl(folder)); | 79 | folders.Add(new InventoryFolderImpl(folder)); |
80 | items.AddRange(RequestFolderItems(folder.ID)); | 80 | items.AddRange(RequestFolderItems(folder.ID)); |
81 | } | 81 | } |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
85 | m_log.InfoFormat( | 85 | m_log.InfoFormat( |
86 | "[LOCAL INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items", | 86 | "[LOCAL INVENTORY SERVICE]: Received inventory response for user {0} containing {1} folders and {2} items", |
87 | userID, folders.Count, items.Count); | 87 | userID, folders.Count, items.Count); |
88 | } | 88 | } |
89 | else | 89 | else |
90 | { | 90 | { |
91 | m_log.WarnFormat( "[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); | 91 | m_log.WarnFormat( "[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); |
92 | } | 92 | } |
93 | 93 | ||
94 | callback(folders, items); | 94 | callback(folders, items); |