1 files changed, 24 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index ab6be50..c7244c8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -49,6 +49,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         private IInventoryService m_InventoryService;
 
+        private Scene m_Scene;
+
+        private IUserManagement m_UserManager;
+        private IUserManagement UserManager
+        {
+            get
+            {
+                if (m_UserManager == null)
+                {
+                    m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
+                }
+                return m_UserManager;
+            }
+        }
+
         private bool m_Enabled = false;
 
         public Type ReplaceableInterface 
@@ -115,6 +130,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 return;
             
             scene.RegisterModuleInterface<IInventoryService>(this);
+
+            if (m_Scene == null)
+                m_Scene = scene;
         }
 
         public void RemoveRegion(Scene scene)
@@ -163,7 +181,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
-            return m_InventoryService.GetFolderContent(userID, folderID);
+            InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID);
+            if (UserManager != null)
+                foreach (InventoryItemBase item in invCol.Items)
+                    UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+
+            return invCol;
         }
 
         public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)