diff options
| author | Diva Canto | 2010-11-29 09:58:20 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-11-29 09:58:20 -0800 |
| commit | f3835fe15c91ece4ad61ba1caa67603374ad2574 (patch) | |
| tree | bed4cf2014aeea194086d940e8c86ac998bc692a /OpenSim/Region/CoreModules/Framework | |
| parent | Fix unit test. (diff) | |
| parent | Fix the build break (diff) | |
| download | opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.zip opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.tar.gz opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.tar.bz2 opensim-SC_OLD-f3835fe15c91ece4ad61ba1caa67603374ad2574.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -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 f02a922..b57dc88 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -903,8 +903,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 903 | } | 903 | } |
| 904 | 904 | ||
| 905 | agent.MakeChildAgent(); | 905 | agent.MakeChildAgent(); |
| 906 | |||
| 906 | // now we have a child agent in this region. Request all interesting data about other (root) agents | 907 | // now we have a child agent in this region. Request all interesting data about other (root) agents |
| 907 | agent.SendInitialFullUpdateToAllClients(); | 908 | agent.SendOtherAgentsAvatarDataToMe(); |
| 909 | agent.SendOtherAgentsAppearanceToMe(); | ||
| 908 | 910 | ||
| 909 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); | 911 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); |
| 910 | 912 | ||