diff options
author | Melanie | 2012-06-29 04:03:24 +0200 |
---|---|---|
committer | Melanie | 2012-06-29 04:03:24 +0200 |
commit | 2870659b5ce7d59eb782abe8ff31395762b40acd (patch) | |
tree | fc76e34cbba2ae0ca6dce634576fb5a9c0cd3985 /OpenSim | |
parent | Merge branch 'ubitwork' into avination (diff) | |
parent | in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem pri... (diff) | |
download | opensim-SC-2870659b5ce7d59eb782abe8ff31395762b40acd.zip opensim-SC-2870659b5ce7d59eb782abe8ff31395762b40acd.tar.gz opensim-SC-2870659b5ce7d59eb782abe8ff31395762b40acd.tar.bz2 opensim-SC-2870659b5ce7d59eb782abe8ff31395762b40acd.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 80b6f64..9c96b52 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5078,10 +5078,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5078 | update.TextureEntry = Utils.EmptyBytes; | 5078 | update.TextureEntry = Utils.EmptyBytes; |
5079 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; | 5079 | // update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes; |
5080 | 5080 | ||
5081 | /* all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854) | ||
5081 | update.UpdateFlags = (uint)( | 5082 | update.UpdateFlags = (uint)( |
5082 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | | 5083 | PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | |
5083 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | | 5084 | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | |
5084 | PrimFlags.ObjectOwnerModify); | 5085 | PrimFlags.ObjectOwnerModify); |
5086 | */ | ||
5087 | update.UpdateFlags = 0; | ||
5085 | 5088 | ||
5086 | return update; | 5089 | return update; |
5087 | } | 5090 | } |