aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs18
2 files changed, 18 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9559cc4..cac178d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2800,21 +2800,6 @@ namespace OpenSim.Region.Framework.Scenes
2800 // Cache the user's name 2800 // Cache the user's name
2801 CacheUserName(sp, aCircuit); 2801 CacheUserName(sp, aCircuit);
2802 2802
2803 // Let's send the Suitcase or the real root folder folder for incoming HG agents
2804 // Visiting agents get their suitcase contents; incoming local users get their real root folder's content
2805 if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
2806 {
2807 // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS
2808 IConfig config = m_config.Configs["HGEntityTransfer"];
2809 if (config != null && config.GetBoolean("RestrictInventoryAccessAbroad", false))
2810 {
2811 m_log.DebugFormat("[SCENE]: Sending root folder to viewer...");
2812 InventoryFolderBase root = InventoryService.GetRootFolder(client.AgentId);
2813 //InventoryCollection rootContents = InventoryService.GetFolderContent(client.AgentId, root.ID);
2814 client.SendBulkUpdateInventory(root);
2815 }
2816 }
2817
2818 EventManager.TriggerOnNewClient(client); 2803 EventManager.TriggerOnNewClient(client);
2819 if (vialogin) 2804 if (vialogin)
2820 { 2805 {
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;
32using System.Timers; 32using System.Timers;
33using OpenMetaverse; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using Nini.Config;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Client; 37using OpenSim.Framework.Client;
37using OpenSim.Region.Framework.Interfaces; 38using 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);