aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-28 18:46:45 +0000
committerMelanie Thielker2009-07-28 18:46:45 +0000
commit64c874a9519e734865358179c85d4dedab4c899c (patch)
tree284765abe300c734202ecd7ee48ed5c5c66140e5 /OpenSim
parentThank you, mcortez, for a patch to correct a folder bloat issue in the (diff)
downloadopensim-SC_OLD-64c874a9519e734865358179c85d4dedab4c899c.zip
opensim-SC_OLD-64c874a9519e734865358179c85d4dedab4c899c.tar.gz
opensim-SC_OLD-64c874a9519e734865358179c85d4dedab4c899c.tar.bz2
opensim-SC_OLD-64c874a9519e734865358179c85d4dedab4c899c.tar.xz
Fix a null data block in DirClassifiedReply packet, preventing a session
crash in search. Fixes Mantis #3952
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f95fb03..8c4fb0e 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -493,6 +493,7 @@ namespace OpenSim.Framework
493 public uint creationDate; 493 public uint creationDate;
494 public uint expirationDate; 494 public uint expirationDate;
495 public int price; 495 public int price;
496 public uint Status;
496 } 497 }
497 498
498 public struct DirLandReplyData 499 public struct DirLandReplyData
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 30d6fb1..441188e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -10243,11 +10243,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10243 10243
10244 packet.QueryReplies = new DirClassifiedReplyPacket.QueryRepliesBlock[ 10244 packet.QueryReplies = new DirClassifiedReplyPacket.QueryRepliesBlock[
10245 data.Length]; 10245 data.Length];
10246 packet.StatusData = new DirClassifiedReplyPacket.StatusDataBlock[
10247 data.Length];
10246 10248
10247 int i = 0; 10249 int i = 0;
10248 foreach (DirClassifiedReplyData d in data) 10250 foreach (DirClassifiedReplyData d in data)
10249 { 10251 {
10250 packet.QueryReplies[i] = new DirClassifiedReplyPacket.QueryRepliesBlock(); 10252 packet.QueryReplies[i] = new DirClassifiedReplyPacket.QueryRepliesBlock();
10253 packet.StatusData[i] = new DirClassifiedReplyPacket.StatusDataBlock();
10251 packet.QueryReplies[i].ClassifiedID = d.classifiedID; 10254 packet.QueryReplies[i].ClassifiedID = d.classifiedID;
10252 packet.QueryReplies[i].Name = 10255 packet.QueryReplies[i].Name =
10253 Utils.StringToBytes(d.name); 10256 Utils.StringToBytes(d.name);
@@ -10255,6 +10258,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
10255 packet.QueryReplies[i].CreationDate = d.creationDate; 10258 packet.QueryReplies[i].CreationDate = d.creationDate;
10256 packet.QueryReplies[i].ExpirationDate = d.expirationDate; 10259 packet.QueryReplies[i].ExpirationDate = d.expirationDate;
10257 packet.QueryReplies[i].PriceForListing = d.price; 10260 packet.QueryReplies[i].PriceForListing = d.price;
10261 packet.StatusData[i].Status = d.Status;
10258 i++; 10262 i++;
10259 } 10263 }
10260 10264