diff options
author | UbitUmarov | 2014-08-25 22:45:31 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-25 22:45:31 +0100 |
commit | 75cbe620c025dba998d8291277e499ecb27a250c (patch) | |
tree | ad64fe813dca5c6a436d3e5dcb0f6e4812f6d3ac | |
parent | change enconding of attachment updates NameValue and State fields (diff) | |
download | opensim-SC-75cbe620c025dba998d8291277e499ecb27a250c.zip opensim-SC-75cbe620c025dba998d8291277e499ecb27a250c.tar.gz opensim-SC-75cbe620c025dba998d8291277e499ecb27a250c.tar.bz2 opensim-SC-75cbe620c025dba998d8291277e499ecb27a250c.tar.xz |
*test* cleanup the bugs nest
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b45d561..0663983 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -5411,19 +5411,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5411 | 5411 | ||
5412 | if (data.ParentGroup.IsAttachment) | 5412 | if (data.ParentGroup.IsAttachment) |
5413 | { | 5413 | { |
5414 | if (data.UUID != data.ParentGroup.RootPart.UUID) | 5414 | if (data.UUID == data.ParentGroup.RootPart.UUID) |
5415 | { | 5415 | { |
5416 | update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID); | 5416 | update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID); |
5417 | } | 5417 | } |
5418 | else | 5418 | else |
5419 | update.NameValue = Utils.EmptyBytes; | 5419 | update.NameValue = Utils.EmptyBytes; |
5420 | 5420 | ||
5421 | int st = (int)data.ParentGroup.RootPart.Shape.State; | 5421 | int st = (int)data.ParentGroup.AttachmentPoint; |
5422 | st = (st & 0xf0) >> 4 + (st & 0x0f) << 4; | 5422 | update.State = (byte)(((st & 0xf0) >> 4) + ((st & 0x0f) << 4)); ; |
5423 | update.State = (byte)st; | 5423 | } |
5424 | else | ||
5425 | { | ||
5426 | update.NameValue = Utils.EmptyBytes; | ||
5427 | update.State = data.Shape.State; // not sure about this | ||
5424 | } | 5428 | } |
5425 | // else | ||
5426 | // update.State = data.Shape.State; // not sure about this | ||
5427 | 5429 | ||
5428 | 5430 | ||
5429 | // m_log.DebugFormat( | 5431 | // m_log.DebugFormat( |