aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-29 01:08:47 +0100
committerJustin Clark-Casey (justincc)2012-03-29 01:08:47 +0100
commit93ac47f0d3968650bd7758ad0981e8e5d49b8138 (patch)
treede296d7d41d9094365b6d17b6bc9cb98e6d7396c /OpenSim/Region/Framework/Scenes
parentRevert "Add comment about setting client.SceneAgent in AddNewClient()" (diff)
downloadopensim-SC_OLD-93ac47f0d3968650bd7758ad0981e8e5d49b8138.zip
opensim-SC_OLD-93ac47f0d3968650bd7758ad0981e8e5d49b8138.tar.gz
opensim-SC_OLD-93ac47f0d3968650bd7758ad0981e8e5d49b8138.tar.bz2
opensim-SC_OLD-93ac47f0d3968650bd7758ad0981e8e5d49b8138.tar.xz
Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents."
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index fe3438e..7993abe 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.Framework.Scenes
71 /// Triggered when a new client is added to the scene. 71 /// Triggered when a new client is added to the scene.
72 /// </summary> 72 /// </summary>
73 /// <remarks> 73 /// <remarks>
74 /// This is triggered for both child and root agent client connections.
75 /// Triggered before OnClientLogin. 74 /// Triggered before OnClientLogin.
76 /// </remarks> 75 /// </remarks>
77 public event OnNewClientDelegate OnNewClient; 76 public event OnNewClientDelegate OnNewClient;
@@ -192,7 +191,7 @@ namespace OpenSim.Region.Framework.Scenes
192 public delegate void ClientClosed(UUID clientID, Scene scene); 191 public delegate void ClientClosed(UUID clientID, Scene scene);
193 192
194 /// <summary> 193 /// <summary>
195 /// Fired when a client is removed from a scene whether it's a child or a root agent. 194 /// Fired when a client is removed from a scene.
196 /// </summary> 195 /// </summary>
197 /// <remarks> 196 /// <remarks>
198 /// At the point of firing, the scene still contains the client's scene presence. 197 /// At the point of firing, the scene still contains the client's scene presence.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 60fe48f..c887b4e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2670,7 +2670,6 @@ namespace OpenSim.Region.Framework.Scenes
2670 sp.IsChildAgent ? "child" : "root", sp.Name, RegionInfo.RegionName); 2670 sp.IsChildAgent ? "child" : "root", sp.Name, RegionInfo.RegionName);
2671 } 2671 }
2672 2672
2673 client.SceneAgent = sp;
2674 m_LastLogin = Util.EnvironmentTickCount(); 2673 m_LastLogin = Util.EnvironmentTickCount();
2675 2674
2676 // Cache the user's name 2675 // Cache the user's name