diff options
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 7 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 97d963d..0d19932 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -141,9 +141,10 @@ namespace OpenSim.Framework.Communications | |||
141 | 141 | ||
142 | if (null != existingRootFolder) | 142 | if (null != existingRootFolder) |
143 | { | 143 | { |
144 | m_log.ErrorFormat("[AGENT INVENTORY]: " + | 144 | m_log.ErrorFormat( |
145 | "Did not create a new inventory for user {0} since they already have " | 145 | "[AGENT INVENTORY]: Did not create a new inventory for user {0} since they already have " |
146 | + "a root inventory folder with id {1}", user, existingRootFolder); | 146 | + "a root inventory folder with id {1}", |
147 | user, existingRootFolder.ID); | ||
147 | } | 148 | } |
148 | else | 149 | else |
149 | { | 150 | { |
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index f08c1e5..ffff89f 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -89,7 +89,11 @@ namespace OpenSim.Grid.InventoryServer | |||
89 | return allFolders; | 89 | return allFolders; |
90 | } | 90 | } |
91 | 91 | ||
92 | 92 | /// <summary> | |
93 | /// Return a user's entire inventory | ||
94 | /// </summary> | ||
95 | /// <param name="rawUserID"></param> | ||
96 | /// <returns></returns> | ||
93 | public InventoryCollection GetUserInventory(Guid rawUserID) | 97 | public InventoryCollection GetUserInventory(Guid rawUserID) |
94 | { | 98 | { |
95 | LLUUID userID = new LLUUID(rawUserID); | 99 | LLUUID userID = new LLUUID(rawUserID); |
@@ -134,6 +138,11 @@ namespace OpenSim.Grid.InventoryServer | |||
134 | return GetInventorySkeleton(userID); | 138 | return GetInventorySkeleton(userID); |
135 | } | 139 | } |
136 | 140 | ||
141 | /// <summary> | ||
142 | /// Create an inventory for the given user. | ||
143 | /// </summary> | ||
144 | /// <param name="rawUserID"></param> | ||
145 | /// <returns></returns> | ||
137 | public bool CreateUsersInventory(Guid rawUserID) | 146 | public bool CreateUsersInventory(Guid rawUserID) |
138 | { | 147 | { |
139 | LLUUID userID = new LLUUID(rawUserID); | 148 | LLUUID userID = new LLUUID(rawUserID); |