aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs3
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index af20687..32432b4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4601,13 +4601,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4601 ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack; 4601 ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack;
4602 handlerObjectIncludeInSearch = null; 4602 handlerObjectIncludeInSearch = null;
4603 4603
4604 foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData) { 4604 foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData)
4605 {
4605 bool inSearch = objData.IncludeInSearch; 4606 bool inSearch = objData.IncludeInSearch;
4606 uint localID = objData.ObjectLocalID; 4607 uint localID = objData.ObjectLocalID;
4607 4608
4608 handlerObjectIncludeInSearch = OnObjectIncludeInSearch; 4609 handlerObjectIncludeInSearch = OnObjectIncludeInSearch;
4609 4610
4610 if (handlerObjectIncludeInSearch != null) { 4611 if (handlerObjectIncludeInSearch != null)
4612 {
4611 handlerObjectIncludeInSearch(this, inSearch, localID); 4613 handlerObjectIncludeInSearch(this, inSearch, localID);
4612 } 4614 }
4613 } 4615 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index c6da96e..8f90f34 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
148 return; 148 return;
149 } 149 }
150 150
151 lock (this) { 151 lock (this)
152 {
152 switch (item.throttleType) 153 switch (item.throttleType)
153 { 154 {
154 case ThrottleOutPacketType.Resend: 155 case ThrottleOutPacketType.Resend: