diff options
author | Melanie | 2013-09-16 22:32:53 +0100 |
---|---|---|
committer | Melanie | 2013-09-16 22:32:53 +0100 |
commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/ClientStack/Linden/UDP | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
download | opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index dc28be8..36edd0b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -4004,6 +4004,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4004 | part.Shape.ProfileHollow = 27500; | 4004 | part.Shape.ProfileHollow = 27500; |
4005 | } | 4005 | } |
4006 | } | 4006 | } |
4007 | else if (update.Entity is ScenePresence) | ||
4008 | { | ||
4009 | ScenePresence presence = (ScenePresence)update.Entity; | ||
4010 | |||
4011 | // If ParentUUID is not UUID.Zero and ParentID is 0, this | ||
4012 | // avatar is in the process of crossing regions while | ||
4013 | // sat on an object. In this state, we don't want any | ||
4014 | // updates because they will visually orbit the avatar. | ||
4015 | // Update will be forced once crossing is completed anyway. | ||
4016 | if (presence.ParentUUID != UUID.Zero && presence.ParentID == 0) | ||
4017 | continue; | ||
4018 | } | ||
4007 | 4019 | ||
4008 | ++updatesThisCall; | 4020 | ++updatesThisCall; |
4009 | 4021 | ||