diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IUserManagement.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs index bfb8369..24cd069 100644 --- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs +++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs | |||
@@ -16,6 +16,21 @@ namespace OpenSim.Region.Framework.Interfaces | |||
16 | string GetUserServerURL(UUID uuid, string serverType); | 16 | string GetUserServerURL(UUID uuid, string serverType); |
17 | 17 | ||
18 | /// <summary> | 18 | /// <summary> |
19 | /// Get user ID by the given name. | ||
20 | /// </summary> | ||
21 | /// <param name="name"></param> | ||
22 | /// <returns>UUID.Zero if no user with that name is found or if the name is "Unknown User"</returns> | ||
23 | UUID GetUserIdByName(string name); | ||
24 | |||
25 | /// <summary> | ||
26 | /// Get user ID by the given name. | ||
27 | /// </summary> | ||
28 | /// <param name="firstName"></param> | ||
29 | /// <param name="lastName"></param> | ||
30 | /// <returns>UUID.Zero if no user with that name is found or if the name is "Unknown User"</returns> | ||
31 | UUID GetUserIdByName(string firstName, string lastName); | ||
32 | |||
33 | /// <summary> | ||
19 | /// Add a user. | 34 | /// Add a user. |
20 | /// </summary> | 35 | /// </summary> |
21 | /// <remarks> | 36 | /// <remarks> |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 973be39..9559cc4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2800,12 +2800,19 @@ 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 folder for incoming HG agents | 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 | ||
2804 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | 2805 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) |
2805 | { | 2806 | { |
2806 | m_log.DebugFormat("[SCENE]: Sending root folder to viewer..."); | 2807 | // HACK FOR NOW. JUST TESTING, SO KEEPING EVERYONE ELSE OUT OF THESE TESTS |
2807 | InventoryFolderBase suitcase = InventoryService.GetRootFolder(client.AgentId); | 2808 | IConfig config = m_config.Configs["HGEntityTransfer"]; |
2808 | client.SendBulkUpdateInventory(suitcase); | 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 | } | ||
2809 | } | 2816 | } |
2810 | 2817 | ||
2811 | EventManager.TriggerOnNewClient(client); | 2818 | EventManager.TriggerOnNewClient(client); |