diff options
| author | UbitUmarov | 2014-11-01 00:01:11 +0000 |
|---|---|---|
| committer | UbitUmarov | 2014-11-01 00:01:11 +0000 |
| commit | 5cca6e7d16ee4dbfd23a0adcb50221e3e3051259 (patch) | |
| tree | f0d9d361dda207a116dc10d80b5fd22c8254c8c6 | |
| parent | sadly revert to resend terseUpdates enqueuing them back into entityupdates (diff) | |
| download | opensim-SC_OLD-5cca6e7d16ee4dbfd23a0adcb50221e3e3051259.zip opensim-SC_OLD-5cca6e7d16ee4dbfd23a0adcb50221e3e3051259.tar.gz opensim-SC_OLD-5cca6e7d16ee4dbfd23a0adcb50221e3e3051259.tar.bz2 opensim-SC_OLD-5cca6e7d16ee4dbfd23a0adcb50221e3e3051259.tar.xz | |
don't send updates for deleted agents
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index da30a04..4b15e9f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -3832,8 +3832,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 3832 | /// The original update time is used for the merged update. | 3832 | /// The original update time is used for the merged update. |
| 3833 | /// </summary> | 3833 | /// </summary> |
| 3834 | private void ResendPrimUpdate(EntityUpdate update) | 3834 | private void ResendPrimUpdate(EntityUpdate update) |
| 3835 | { | 3835 | { |
| 3836 | // If the update exists in priority queue, it will be updated. | 3836 | // If the update exists in priority queue, it will be updated. |
| 3837 | // If it does not exist then it will be added with the current (rather than its original) priority | 3837 | // If it does not exist then it will be added with the current (rather than its original) priority |
| 3838 | uint priority = m_prioritizer.GetUpdatePriority(this, update.Entity); | 3838 | uint priority = m_prioritizer.GetUpdatePriority(this, update.Entity); |
| 3839 | 3839 | ||
| @@ -3975,7 +3975,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 3975 | else if (update.Entity is ScenePresence) | 3975 | else if (update.Entity is ScenePresence) |
| 3976 | { | 3976 | { |
| 3977 | ScenePresence presence = (ScenePresence)update.Entity; | 3977 | ScenePresence presence = (ScenePresence)update.Entity; |
| 3978 | 3978 | if (presence.IsDeleted) | |
| 3979 | continue; | ||
| 3979 | // If ParentUUID is not UUID.Zero and ParentID is 0, this | 3980 | // If ParentUUID is not UUID.Zero and ParentID is 0, this |
| 3980 | // avatar is in the process of crossing regions while | 3981 | // avatar is in the process of crossing regions while |
| 3981 | // sat on an object. In this state, we don't want any | 3982 | // sat on an object. In this state, we don't want any |