diff options
| author | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
|---|---|---|
| committer | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
| commit | 140ea04b9d692344d803fc87364fb252561725c3 (patch) | |
| tree | d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
| parent | Merge pull request #7 from gamucf/moses.metricsPhase2 (diff) | |
| parent | resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff) | |
| download | opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.xz | |
Merging Opensim upstream before generating patch
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 311dd31..284c5fa 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -3747,6 +3747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 3747 | avp.Sender.IsTrial = false; | 3747 | avp.Sender.IsTrial = false; |
| 3748 | avp.Sender.ID = agentID; | 3748 | avp.Sender.ID = agentID; |
| 3749 | avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0]; | 3749 | avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0]; |
| 3750 | avp.AppearanceHover = new AvatarAppearancePacket.AppearanceHoverBlock[0]; | ||
| 3750 | //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); | 3751 | //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); |
| 3751 | OutPacket(avp, ThrottleOutPacketType.Task); | 3752 | OutPacket(avp, ThrottleOutPacketType.Task); |
| 3752 | } | 3753 | } |
| @@ -4465,7 +4466,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4465 | { | 4466 | { |
| 4466 | uint priority = 0; // time based ordering only | 4467 | uint priority = 0; // time based ordering only |
| 4467 | lock (m_entityProps.SyncRoot) | 4468 | lock (m_entityProps.SyncRoot) |
| 4468 | m_entityProps.Enqueue(priority, new ObjectPropertyUpdate(entity,requestFlags,true,false)); | 4469 | m_entityProps.Enqueue(priority, new ObjectPropertyUpdate(entity,requestFlags,true,true)); |
| 4469 | } | 4470 | } |
| 4470 | 4471 | ||
| 4471 | private void ResendPropertyUpdate(ObjectPropertyUpdate update) | 4472 | private void ResendPropertyUpdate(ObjectPropertyUpdate update) |