diff options
author | Diva Canto | 2012-03-27 20:36:54 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-27 20:36:54 -0700 |
commit | af96b99356414eca2e65f4976e9c6ea5ab36f87a (patch) | |
tree | 1b5a671dbc431369a3714fffcffd258c16954337 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-af96b99356414eca2e65f4976e9c6ea5ab36f87a.zip opensim-SC_OLD-af96b99356414eca2e65f4976e9c6ea5ab36f87a.tar.gz opensim-SC_OLD-af96b99356414eca2e65f4976e9c6ea5ab36f87a.tar.bz2 opensim-SC_OLD-af96b99356414eca2e65f4976e9c6ea5ab36f87a.tar.xz |
More on switching the root folder from under the viewer. More experiments.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1f5cddd..c887b4e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2675,21 +2675,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2675 | // Cache the user's name | 2675 | // Cache the user's name |
2676 | CacheUserName(sp, aCircuit); | 2676 | CacheUserName(sp, aCircuit); |
2677 | 2677 | ||
2678 | // Let's send the Suitcase or the real root folder folder for incoming HG agents | ||
2679 | // Visiting agents get their suitcase contents; incoming local users get their real root folder's content | ||
2680 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | ||
2681 | { | ||
2682 | // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS | ||
2683 | IConfig config = m_config.Configs["HGEntityTransfer"]; | ||
2684 | if (config != null && config.GetBoolean("RestrictInventoryAccessAbroad", false)) | ||
2685 | { | ||
2686 | m_log.DebugFormat("[SCENE]: Sending root folder to viewer..."); | ||
2687 | InventoryFolderBase root = InventoryService.GetRootFolder(client.AgentId); | ||
2688 | //InventoryCollection rootContents = InventoryService.GetFolderContent(client.AgentId, root.ID); | ||
2689 | client.SendBulkUpdateInventory(root); | ||
2690 | } | ||
2691 | } | ||
2692 | |||
2693 | EventManager.TriggerOnNewClient(client); | 2678 | EventManager.TriggerOnNewClient(client); |
2694 | if (vialogin) | 2679 | if (vialogin) |
2695 | EventManager.TriggerOnClientLogin(client); | 2680 | EventManager.TriggerOnClientLogin(client); |