aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-08-26 18:23:43 -0700
committerDiva Canto2010-08-26 18:23:43 -0700
commit0ca87a6f01cec70ef54e93a4d377eed7f62c6291 (patch)
tree6ba0a2ee0da1cc5d9a85db7fbcdd1702b8d164dd /OpenSim
parentDeleted Check4096 from Robust.ini.example (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-0ca87a6f01cec70ef54e93a4d377eed7f62c6291.zip
opensim-SC_OLD-0ca87a6f01cec70ef54e93a4d377eed7f62c6291.tar.gz
opensim-SC_OLD-0ca87a6f01cec70ef54e93a4d377eed7f62c6291.tar.bz2
opensim-SC_OLD-0ca87a6f01cec70ef54e93a4d377eed7f62c6291.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 677bd14..34cc7d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2728,6 +2728,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2728 DirPlacesReplyPacket.StatusDataBlock[] status = 2728 DirPlacesReplyPacket.StatusDataBlock[] status =
2729 new DirPlacesReplyPacket.StatusDataBlock[0]; 2729 new DirPlacesReplyPacket.StatusDataBlock[0];
2730 2730
2731 packet.QueryReplies = replies;
2732 packet.StatusData = status;
2733
2731 foreach (DirPlacesReplyData d in data) 2734 foreach (DirPlacesReplyData d in data)
2732 { 2735 {
2733 int idx = replies.Length; 2736 int idx = replies.Length;
@@ -2766,7 +2769,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2766 } 2769 }
2767 } 2770 }
2768 2771
2769 if (replies.Length > 0) 2772 if (replies.Length > 0 || data.Length == 0)
2770 OutPacket(packet, ThrottleOutPacketType.Task); 2773 OutPacket(packet, ThrottleOutPacketType.Task);
2771 } 2774 }
2772 2775