diff options
author | Justin Clark-Casey (justincc) | 2012-03-29 01:26:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-29 01:26:30 +0100 |
commit | 22a85b947a16074525343a56203211806ce16834 (patch) | |
tree | 0ce05c1edf757ed7d0d611bbdefe79816b6d65dc /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Change namespace on CallingCardModule and correct interface file placemant. A... (diff) | |
download | opensim-SC-22a85b947a16074525343a56203211806ce16834.zip opensim-SC-22a85b947a16074525343a56203211806ce16834.tar.gz opensim-SC-22a85b947a16074525343a56203211806ce16834.tar.bz2 opensim-SC-22a85b947a16074525343a56203211806ce16834.tar.xz |
Add back parts of reverted changes that were not concerned with child agent caching.
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c887b4e..44cd30a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2670,6 +2670,10 @@ 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 | // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the | ||
2674 | // client is for a root or child agent. | ||
2675 | client.SceneAgent = sp; | ||
2676 | |||
2673 | m_LastLogin = Util.EnvironmentTickCount(); | 2677 | m_LastLogin = Util.EnvironmentTickCount(); |
2674 | 2678 | ||
2675 | // Cache the user's name | 2679 | // Cache the user's name |