diff options
| author | meta7 | 2010-08-18 02:53:27 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-18 02:53:27 -0700 |
| commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
| tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Fix a nullref exception in the prioritizer (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4064339..02e60f8 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -905,7 +905,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 905 | m_grouptitle = gm.GetGroupTitle(m_uuid); | 905 | m_grouptitle = gm.GetGroupTitle(m_uuid); |
| 906 | 906 | ||
| 907 | m_rootRegionHandle = m_scene.RegionInfo.RegionHandle; | 907 | m_rootRegionHandle = m_scene.RegionInfo.RegionHandle; |
| 908 | m_scene.SetRootAgentScene(m_uuid); | 908 | |
| 909 | m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); | ||
| 909 | 910 | ||
| 910 | // Moved this from SendInitialData to ensure that m_appearance is initialized | 911 | // Moved this from SendInitialData to ensure that m_appearance is initialized |
| 911 | // before the inventory is processed in MakeRootAgent. This fixes a race condition | 912 | // before the inventory is processed in MakeRootAgent. This fixes a race condition |