diff options
author | Diva Canto | 2012-03-27 11:54:13 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-27 11:54:13 -0700 |
commit | de242a29caaaa77de5ea175a2abab9cdcafcd878 (patch) | |
tree | c61b78515ebd0fc95ec700e8845b56e035a10288 /OpenSim/Region/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-de242a29caaaa77de5ea175a2abab9cdcafcd878.zip opensim-SC-de242a29caaaa77de5ea175a2abab9cdcafcd878.tar.gz opensim-SC-de242a29caaaa77de5ea175a2abab9cdcafcd878.tar.bz2 opensim-SC-de242a29caaaa77de5ea175a2abab9cdcafcd878.tar.xz |
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0dcbcdb..c95c151 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2675,6 +2675,14 @@ 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 | ||
2679 | if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) | ||
2680 | { | ||
2681 | m_log.DebugFormat("[SCENE]: Sending root folder to viewer..."); | ||
2682 | InventoryFolderBase suitcase = InventoryService.GetRootFolder(client.AgentId); | ||
2683 | client.SendBulkUpdateInventory(suitcase); | ||
2684 | } | ||
2685 | |||
2678 | EventManager.TriggerOnNewClient(client); | 2686 | EventManager.TriggerOnNewClient(client); |
2679 | if (vialogin) | 2687 | if (vialogin) |
2680 | EventManager.TriggerOnClientLogin(client); | 2688 | EventManager.TriggerOnClientLogin(client); |