diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a23dc31..ee8a236 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; |
@@ -1236,6 +1237,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
1236 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1237 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1237 | } | 1238 | } |
1238 | 1239 | ||
1240 | // HACK HACK -- just seeing how the viewer responds | ||
1241 | // Let's send the Suitcase or the real root folder folder for incoming HG agents | ||
1242 | // Visiting agents get their suitcase contents; incoming local users get their real root folder's content | ||
1243 | AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(UUID); | ||
1244 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | ||
1245 | { | ||
1246 | // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS | ||
1247 | IConfig config = m_scene.Config.Configs["HGEntityTransferModule"]; | ||
1248 | if (config != null && config.GetBoolean("RestrictInventoryAccessAbroad", false)) | ||
1249 | { | ||
1250 | m_log.DebugFormat("[SCENE]: Sending root folder to viewer..."); | ||
1251 | InventoryFolderBase root = m_scene.InventoryService.GetRootFolder(client.AgentId); | ||
1252 | //InventoryCollection rootContents = InventoryService.GetFolderContent(client.AgentId, root.ID); | ||
1253 | client.SendBulkUpdateInventory(root); | ||
1254 | } | ||
1255 | } | ||
1256 | |||
1239 | // m_log.DebugFormat( | 1257 | // m_log.DebugFormat( |
1240 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1258 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
1241 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1259 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |