diff options
author | Diva Canto | 2012-03-27 19:08:29 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-27 19:08:29 -0700 |
commit | 300968e9339786611c9ac5c2ff3b58dec1c0c30e (patch) | |
tree | 85e4631fb95f94ea78ba3510e24627d3186664c5 /OpenSim/Region/Framework/Scenes | |
parent | Add a corresponding method for items. HG v2 (diff) | |
download | opensim-SC_OLD-300968e9339786611c9ac5c2ff3b58dec1c0c30e.zip opensim-SC_OLD-300968e9339786611c9ac5c2ff3b58dec1c0c30e.tar.gz opensim-SC_OLD-300968e9339786611c9ac5c2ff3b58dec1c0c30e.tar.bz2 opensim-SC_OLD-300968e9339786611c9ac5c2ff3b58dec1c0c30e.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 11 insertions, 4 deletions
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 | |||
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 folder for incoming HG agents | 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 | ||
2679 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | 2680 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) |
2680 | { | 2681 | { |
2681 | m_log.DebugFormat("[SCENE]: Sending root folder to viewer..."); | 2682 | // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS |
2682 | InventoryFolderBase suitcase = InventoryService.GetRootFolder(client.AgentId); | 2683 | IConfig config = m_config.Configs["HGEntityTransfer"]; |
2683 | client.SendBulkUpdateInventory(suitcase); | 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 | } | ||
2684 | } | 2691 | } |
2685 | 2692 | ||
2686 | EventManager.TriggerOnNewClient(client); | 2693 | EventManager.TriggerOnNewClient(client); |