From 300968e9339786611c9ac5c2ff3b58dec1c0c30e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 27 Mar 2012 19:08:29 -0700
Subject: HG: Switch root folders from under the viewer. Towards HG 2.0. This
 is guarded by an obscure config that no one but me should be using at this
 point.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0b31e0c..1f5cddd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2675,12 +2675,19 @@ namespace OpenSim.Region.Framework.Scenes
             // Cache the user's name
             CacheUserName(sp, aCircuit);
 
-            // Let's send the Suitcase folder for incoming HG agents
+            // Let's send the Suitcase or the real root folder folder for incoming HG agents
+            // Visiting agents get their suitcase contents; incoming local users get their real root folder's content
             if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
             {
-                m_log.DebugFormat("[SCENE]: Sending root folder to viewer...");
-                InventoryFolderBase suitcase = InventoryService.GetRootFolder(client.AgentId);
-                client.SendBulkUpdateInventory(suitcase);
+                // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS
+                IConfig config = m_config.Configs["HGEntityTransfer"];
+                if (config != null && config.GetBoolean("RestrictInventoryAccessAbroad", false))
+                {
+                    m_log.DebugFormat("[SCENE]: Sending root folder to viewer...");
+                    InventoryFolderBase root = InventoryService.GetRootFolder(client.AgentId);
+                    //InventoryCollection rootContents = InventoryService.GetFolderContent(client.AgentId, root.ID);
+                    client.SendBulkUpdateInventory(root);
+                }
             }
 
             EventManager.TriggerOnNewClient(client);
-- 
cgit v1.1