diff options
author | Melanie Thielker | 2009-07-28 19:28:01 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-07-28 19:28:01 +0000 |
commit | aa06d9f98b9f73f48e65de2bea2d1c129b1bf9bc (patch) | |
tree | 069c0e18c6fa06a2ed592badf7d62afafdd9a5d6 | |
parent | Fix a null data block in DirClassifiedReply packet, preventing a session (diff) | |
download | opensim-SC_OLD-aa06d9f98b9f73f48e65de2bea2d1c129b1bf9bc.zip opensim-SC_OLD-aa06d9f98b9f73f48e65de2bea2d1c129b1bf9bc.tar.gz opensim-SC_OLD-aa06d9f98b9f73f48e65de2bea2d1c129b1bf9bc.tar.bz2 opensim-SC_OLD-aa06d9f98b9f73f48e65de2bea2d1c129b1bf9bc.tar.xz |
Add the new StatusData block to the other two searchh packets
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 8c4fb0e..1594c44 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -455,6 +455,7 @@ namespace OpenSim.Framework | |||
455 | public bool forSale; | 455 | public bool forSale; |
456 | public bool auction; | 456 | public bool auction; |
457 | public float dwell; | 457 | public float dwell; |
458 | public uint Status; | ||
458 | } | 459 | } |
459 | 460 | ||
460 | public struct DirPeopleReplyData | 461 | public struct DirPeopleReplyData |
@@ -475,6 +476,7 @@ namespace OpenSim.Framework | |||
475 | public string date; | 476 | public string date; |
476 | public uint unixTime; | 477 | public uint unixTime; |
477 | public uint eventFlags; | 478 | public uint eventFlags; |
479 | public uint Status; | ||
478 | } | 480 | } |
479 | 481 | ||
480 | public struct DirGroupsReplyData | 482 | public struct DirGroupsReplyData |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 441188e..c4018f5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -10120,6 +10120,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10120 | packet.QueryReplies = | 10120 | packet.QueryReplies = |
10121 | new DirPlacesReplyPacket.QueryRepliesBlock[data.Length]; | 10121 | new DirPlacesReplyPacket.QueryRepliesBlock[data.Length]; |
10122 | 10122 | ||
10123 | packet.StatusData = new DirPlacesReplyPacket.StatusDataBlock[ | ||
10124 | data.Length]; | ||
10125 | |||
10123 | packet.AgentData.AgentID = AgentId; | 10126 | packet.AgentData.AgentID = AgentId; |
10124 | 10127 | ||
10125 | packet.QueryData[0].QueryID = queryID; | 10128 | packet.QueryData[0].QueryID = queryID; |
@@ -10129,11 +10132,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10129 | { | 10132 | { |
10130 | packet.QueryReplies[i] = | 10133 | packet.QueryReplies[i] = |
10131 | new DirPlacesReplyPacket.QueryRepliesBlock(); | 10134 | new DirPlacesReplyPacket.QueryRepliesBlock(); |
10135 | packet.StatusData[i] = new DirPlacesReplyPacket.StatusDataBlock(); | ||
10132 | packet.QueryReplies[i].ParcelID = d.parcelID; | 10136 | packet.QueryReplies[i].ParcelID = d.parcelID; |
10133 | packet.QueryReplies[i].Name = Utils.StringToBytes(d.name); | 10137 | packet.QueryReplies[i].Name = Utils.StringToBytes(d.name); |
10134 | packet.QueryReplies[i].ForSale = d.forSale; | 10138 | packet.QueryReplies[i].ForSale = d.forSale; |
10135 | packet.QueryReplies[i].Auction = d.auction; | 10139 | packet.QueryReplies[i].Auction = d.auction; |
10136 | packet.QueryReplies[i].Dwell = d.dwell; | 10140 | packet.QueryReplies[i].Dwell = d.dwell; |
10141 | packet.StatusData[i].Status = d.Status; | ||
10137 | i++; | 10142 | i++; |
10138 | } | 10143 | } |
10139 | 10144 | ||
@@ -10185,10 +10190,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10185 | packet.QueryReplies = new DirEventsReplyPacket.QueryRepliesBlock[ | 10190 | packet.QueryReplies = new DirEventsReplyPacket.QueryRepliesBlock[ |
10186 | data.Length]; | 10191 | data.Length]; |
10187 | 10192 | ||
10193 | packet.StatusData = new DirEventsReplyPacket.StatusDataBlock[ | ||
10194 | data.Length]; | ||
10195 | |||
10188 | int i = 0; | 10196 | int i = 0; |
10189 | foreach (DirEventsReplyData d in data) | 10197 | foreach (DirEventsReplyData d in data) |
10190 | { | 10198 | { |
10191 | packet.QueryReplies[i] = new DirEventsReplyPacket.QueryRepliesBlock(); | 10199 | packet.QueryReplies[i] = new DirEventsReplyPacket.QueryRepliesBlock(); |
10200 | packet.StatusData[i] = new DirEventsReplyPacket.StatusDataBlock(); | ||
10192 | packet.QueryReplies[i].OwnerID = d.ownerID; | 10201 | packet.QueryReplies[i].OwnerID = d.ownerID; |
10193 | packet.QueryReplies[i].Name = | 10202 | packet.QueryReplies[i].Name = |
10194 | Utils.StringToBytes(d.name); | 10203 | Utils.StringToBytes(d.name); |
@@ -10197,6 +10206,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10197 | Utils.StringToBytes(d.date); | 10206 | Utils.StringToBytes(d.date); |
10198 | packet.QueryReplies[i].UnixTime = d.unixTime; | 10207 | packet.QueryReplies[i].UnixTime = d.unixTime; |
10199 | packet.QueryReplies[i].EventFlags = d.eventFlags; | 10208 | packet.QueryReplies[i].EventFlags = d.eventFlags; |
10209 | packet.StatusData[i].Status = d.Status; | ||
10200 | i++; | 10210 | i++; |
10201 | } | 10211 | } |
10202 | 10212 | ||