diff options
| author | UbitUmarov | 2012-02-25 17:51:12 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-25 17:51:12 +0000 |
| commit | 7b6649177edce7c3cc709cf8167c149db30cddf8 (patch) | |
| tree | 7fb472108b607edffbb07262ff044c7aa05aef50 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Delay the sending of the initial werables update until the inventory and (diff) | |
| download | opensim-SC-7b6649177edce7c3cc709cf8167c149db30cddf8.zip opensim-SC-7b6649177edce7c3cc709cf8167c149db30cddf8.tar.gz opensim-SC-7b6649177edce7c3cc709cf8167c149db30cddf8.tar.bz2 opensim-SC-7b6649177edce7c3cc709cf8167c149db30cddf8.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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) |