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 | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-af96b99356414eca2e65f4976e9c6ea5ab36f87a.zip opensim-SC-af96b99356414eca2e65f4976e9c6ea5ab36f87a.tar.gz opensim-SC-af96b99356414eca2e65f4976e9c6ea5ab36f87a.tar.bz2 opensim-SC-af96b99356414eca2e65f4976e9c6ea5ab36f87a.tar.xz |
More on switching the root folder from under the viewer. More experiments.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 18 |
2 files changed, 18 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); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cf60c69..547f66f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -32,6 +32,7 @@ using System.Reflection; | |||
32 | using System.Timers; | 32 | using System.Timers; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using Nini.Config; | ||
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Client; | 37 | using OpenSim.Framework.Client; |
37 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
@@ -1162,6 +1163,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
1162 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1163 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1163 | } | 1164 | } |
1164 | 1165 | ||
1166 | // HACK HACK -- just seeing how the viewer responds | ||
1167 | // Let's send the Suitcase or the real root folder folder for incoming HG agents | ||
1168 | // Visiting agents get their suitcase contents; incoming local users get their real root folder's content | ||
1169 | AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID); | ||
1170 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | ||
1171 | { | ||
1172 | // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS | ||
1173 | IConfig config = m_scene.Config.Configs["HGEntityTransferModule"]; | ||
1174 | if (config != null && config.GetBoolean("RestrictInventoryAccessAbroad", false)) | ||
1175 | { | ||
1176 | m_log.DebugFormat("[SCENE]: Sending root folder to viewer..."); | ||
1177 | InventoryFolderBase root = m_scene.InventoryService.GetRootFolder(client.AgentId); | ||
1178 | //InventoryCollection rootContents = InventoryService.GetFolderContent(client.AgentId, root.ID); | ||
1179 | client.SendBulkUpdateInventory(root); | ||
1180 | } | ||
1181 | } | ||
1182 | |||
1165 | // m_log.DebugFormat( | 1183 | // m_log.DebugFormat( |
1166 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1184 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
1167 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1185 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |