diff options
| author | Melanie | 2012-02-25 12:25:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-25 12:25:16 +0100 |
| commit | 5eb1679367754d530edb4c50d432847ed1a027af (patch) | |
| tree | 7fb472108b607edffbb07262ff044c7aa05aef50 /OpenSim/Region/Framework | |
| parent | Merge branch 'ubitwork' (diff) | |
| download | opensim-SC_OLD-5eb1679367754d530edb4c50d432847ed1a027af.zip opensim-SC_OLD-5eb1679367754d530edb4c50d432847ed1a027af.tar.gz opensim-SC_OLD-5eb1679367754d530edb4c50d432847ed1a027af.tar.bz2 opensim-SC_OLD-5eb1679367754d530edb4c50d432847ed1a027af.tar.xz | |
Delay the sending of the initial werables update until the inventory and
VFS in the viewer are ready. We're much faster than SL and that exposes this
race condition. Also reinstate the extra avatar data send on login
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 01053bf..26fa6c0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1000,8 +1000,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1000 | } | 1000 | } |
| 1001 | } | 1001 | } |
| 1002 | 1002 | ||
| 1003 | if (wasChild) | 1003 | SendAvatarDataToAllAgents(); |
| 1004 | SendAvatarDataToAllAgents(); | ||
| 1005 | 1004 | ||
| 1006 | // send the animations of the other presences to me | 1005 | // send the animations of the other presences to me |
| 1007 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) | 1006 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) |