diff options
| author | Justin Clark-Casey (justincc) | 2014-08-15 21:34:58 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-08-15 21:47:34 +0100 |
| commit | 91e1aaa5d41c29fa17609c69ca8bc2a8017dc161 (patch) | |
| tree | 32ff0f7767c9090052261da81b9903063c0d5838 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
| parent | Added RestrictEmail to make llEmail only send to avatars email address if true. (diff) | |
| download | opensim-SC_OLD-91e1aaa5d41c29fa17609c69ca8bc2a8017dc161.zip opensim-SC_OLD-91e1aaa5d41c29fa17609c69ca8bc2a8017dc161.tar.gz opensim-SC_OLD-91e1aaa5d41c29fa17609c69ca8bc2a8017dc161.tar.bz2 opensim-SC_OLD-91e1aaa5d41c29fa17609c69ca8bc2a8017dc161.tar.xz | |
On teleport to a region that already has a child agent established (e.g. a neighbour) don't resend all the initial avatar and object data again.
This is unnecessary since it has been received (and data continues to be received) in the existing child connection.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 5007995..c43633c 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1786,8 +1786,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1786 | m_entityTransferStateMachine.ResetFromTransit(agent.UUID); | 1786 | m_entityTransferStateMachine.ResetFromTransit(agent.UUID); |
| 1787 | 1787 | ||
| 1788 | // now we have a child agent in this region. Request all interesting data about other (root) agents | 1788 | // now we have a child agent in this region. Request all interesting data about other (root) agents |
| 1789 | agent.SendOtherAgentsAvatarDataToMe(); | 1789 | agent.SendOtherAgentsAvatarDataToClient(); |
| 1790 | agent.SendOtherAgentsAppearanceToMe(); | 1790 | agent.SendOtherAgentsAppearanceToClient(); |
| 1791 | 1791 | ||
| 1792 | // Backwards compatibility. Best effort | 1792 | // Backwards compatibility. Best effort |
| 1793 | if (version == "Unknown" || version == string.Empty) | 1793 | if (version == "Unknown" || version == string.Empty) |