aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-28 23:36:30 +0100
committerJustin Clark-Casey (justincc)2012-03-28 23:36:30 +0100
commit33df0c2efd27950ce46c6d00268041af1af591b3 (patch)
tree46d0d5eabf57069a6d4f32873fbe0925758367a5 /OpenSim/Region/Framework/Scenes
parentEnable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoic... (diff)
parentHG 2.0 Suitcase inventory: proof of concept now working properly with the hea... (diff)
downloadopensim-SC_OLD-33df0c2efd27950ce46c6d00268041af1af591b3.zip
opensim-SC_OLD-33df0c2efd27950ce46c6d00268041af1af591b3.tar.gz
opensim-SC_OLD-33df0c2efd27950ce46c6d00268041af1af591b3.tar.bz2
opensim-SC_OLD-33df0c2efd27950ce46c6d00268041af1af591b3.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs16
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 547f66f..19dab32 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1163,22 +1163,6 @@ namespace OpenSim.Region.Framework.Scenes
1163 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1163 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1164 } 1164 }
1165 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 1166
1183// m_log.DebugFormat( 1167// m_log.DebugFormat(
1184// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 1168// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",