aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2013-03-18 23:31:27 +0000
committerMelanie2013-03-18 23:31:27 +0000
commit5e1f651e21ba81d8be9693d7e8a47d49daa9fce5 (patch)
tree4856d3aa25fcd942a26af39e1510f58fef3c934d /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
parentMerge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach (diff)
parentImprove rejection of any attempt to reattach an object that is already attached. (diff)
downloadopensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.zip
opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.gz
opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.bz2
opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.xz
Merge branch 'master' into newmultiattach
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6742d99..7ea538c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4581,7 +4581,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4581 rinfopack.AgentData = new RegionInfoPacket.AgentDataBlock(); 4581 rinfopack.AgentData = new RegionInfoPacket.AgentDataBlock();
4582 rinfopack.AgentData.AgentID = AgentId; 4582 rinfopack.AgentData.AgentID = AgentId;
4583 rinfopack.AgentData.SessionID = SessionId; 4583 rinfopack.AgentData.SessionID = SessionId;
4584 4584 rinfopack.RegionInfo3 = new RegionInfoPacket.RegionInfo3Block[0];
4585 4585
4586 OutPacket(rinfopack, ThrottleOutPacketType.Task); 4586 OutPacket(rinfopack, ThrottleOutPacketType.Task);
4587 } 4587 }
@@ -7069,7 +7069,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7069 7069
7070 if (handlerUpdatePrimFlags != null) 7070 if (handlerUpdatePrimFlags != null)
7071 { 7071 {
7072 byte[] data = Pack.ToBytes(); 7072// byte[] data = Pack.ToBytes();
7073 // 46,47,48 are special positions within the packet 7073 // 46,47,48 are special positions within the packet
7074 // This may change so perhaps we need a better way 7074 // This may change so perhaps we need a better way
7075 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?) 7075 // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?)