diff options
| author | Melanie | 2012-03-29 00:27:35 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-29 00:27:35 +0100 |
| commit | 7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f (patch) | |
| tree | b09be52d5e7838b7c187c92f08f6c2bc73741a42 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add comment about setting client.SceneAgent in AddNewClient() (diff) | |
| download | opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -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 cac178d..cf3270d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2795,6 +2795,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2795 | sp.IsChildAgent ? "child" : "root", sp.Name, RegionInfo.RegionName); | 2795 | sp.IsChildAgent ? "child" : "root", sp.Name, RegionInfo.RegionName); |
| 2796 | } | 2796 | } |
| 2797 | 2797 | ||
| 2798 | // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the | ||
| 2799 | // client is for a root or child agent. | ||
| 2800 | client.SceneAgent = sp; | ||
| 2801 | |||
| 2798 | m_LastLogin = Util.EnvironmentTickCount(); | 2802 | m_LastLogin = Util.EnvironmentTickCount(); |
| 2799 | 2803 | ||
| 2800 | // Cache the user's name | 2804 | // Cache the user's name |