aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2013-07-13 10:05:11 -0700
committerDiva Canto2013-07-13 10:05:11 -0700
commitff4ad60207431427e26a365df1ff28aa380faf12 (patch)
treefece7a6aff10fcc1443faef59a5cf9ddf0f6110d /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-ff4ad60207431427e26a365df1ff28aa380faf12.zip
opensim-SC_OLD-ff4ad60207431427e26a365df1ff28aa380faf12.tar.gz
opensim-SC_OLD-ff4ad60207431427e26a365df1ff28aa380faf12.tar.bz2
opensim-SC_OLD-ff4ad60207431427e26a365df1ff28aa380faf12.tar.xz
Same issue as previous commit.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index bd4f68e..fcb841a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2694,15 +2694,16 @@ namespace OpenSim.Region.Framework.Scenes
2694 // we created a new ScenePresence (a new child agent) in a fresh region. 2694 // we created a new ScenePresence (a new child agent) in a fresh region.
2695 // Request info about all the (root) agents in this region 2695 // Request info about all the (root) agents in this region
2696 // Note: This won't send data *to* other clients in that region (children don't send) 2696 // Note: This won't send data *to* other clients in that region (children don't send)
2697 SendOtherAgentsAvatarDataToMe();
2698 SendOtherAgentsAppearanceToMe();
2699
2700 EntityBase[] entities = Scene.Entities.GetEntities(); 2697 EntityBase[] entities = Scene.Entities.GetEntities();
2701 foreach(EntityBase e in entities) 2698 foreach(EntityBase e in entities)
2702 { 2699 {
2703 if (e != null && e is SceneObjectGroup) 2700 if (e != null && e is SceneObjectGroup)
2704 ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient); 2701 ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
2705 } 2702 }
2703
2704 SendOtherAgentsAvatarDataToMe();
2705 SendOtherAgentsAppearanceToMe();
2706
2706 }); 2707 });
2707 } 2708 }
2708 2709