From 0a47a75b8894942e43a132c8479b1b17e7d4e8b5 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 28 Mar 2008 19:35:01 +0000
Subject: * Send full inventory folder skeleton to standalone client logins
 rather than just the root child folders * This may resolve some current
 problems with non root child folders on standalone installations. * A fix for
 the same problem in grid mode will come soon.

---
 OpenSim/Region/Communications/Local/LocalInventoryService.cs | 4 +++-
 OpenSim/Region/Communications/Local/LocalLoginService.cs     | 3 ++-
 OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs   | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Communications')

diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index f154cd8..fc5cc6c 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -42,7 +42,9 @@ namespace OpenSim.Region.Communications.Local
         public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
                                                      InventoryItemInfo itemCallBack)
         {
-            List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID);
+            //List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID);
+            List<InventoryFolderBase> folders = GetInventorySkeleton(userID);
+            
             InventoryFolderImpl rootFolder = null;
 
             //need to make sure we send root folder first
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5af0077..6bb505d 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -215,7 +215,8 @@ namespace OpenSim.Region.Communications.Local
         // See LoginService        
         protected override InventoryData GetInventorySkeleton(LLUUID userID)
         {
-            List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
+            List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
+            //List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
             if (folders.Count > 0)
             {
                 LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 3551172..e78fc1a 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -216,6 +216,14 @@ namespace OpenSim.Region.Communications.OGS1
         public void CreateNewUserInventory(LLUUID user)
         {
         }
+        
+        // See IInventoryServices
+        public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
+        {
+            m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
+            
+            return new List<InventoryFolderBase>();
+        }
 
         public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
         {
-- 
cgit v1.1