diff options
| author | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
| commit | 45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a (patch) | |
| tree | 0351fb2c756a46d522fe41798c3969e020a3258d /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Merge branch 'master-core' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.zip opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.gz opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.bz2 opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 56aefa5..47548c7 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -876,8 +876,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 876 | } | 876 | } |
| 877 | 877 | ||
| 878 | agent.MakeChildAgent(); | 878 | agent.MakeChildAgent(); |
| 879 | |||
| 879 | // now we have a child agent in this region. Request all interesting data about other (root) agents | 880 | // now we have a child agent in this region. Request all interesting data about other (root) agents |
| 880 | agent.SendInitialFullUpdateToAllClients(); | 881 | agent.SendOtherAgentsAvatarDataToMe(); |
| 882 | agent.SendOtherAgentsAppearanceToMe(); | ||
| 881 | 883 | ||
| 882 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); | 884 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); |
| 883 | 885 | ||