diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-09-21 13:32:25 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-09-21 13:32:25 -0700 |
| commit | fe04921c21036890f0d8dd6b3212667118e47d08 (patch) | |
| tree | b6cabb4ceecc50077c9187df5498fa79e9a537c7 /indra/newview | |
| parent | 9ddfb75551056dc9c02815877fbbb00d8c9be8ca (diff) | |
MAINT-1601 Land remains for sale after purchasing for group.
reviewed with Simon
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 77e382b8c7..7e524df3f6 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1540,6 +1540,16 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use // Actually extract the data. if (parcel) { + if (parcel->getLocalID() != INVALID_PARCEL_ID + && parcel->getLocalID() != local_id) + { + // The parcel has a valid parcel ID but it doesn't match the parcel + // for the data received. + llinfos << "Expecting data for parcel " << parcel->getLocalID() \ + << " but got data for parcel " << local_id << llendl; + return; + } + parcel->init(owner_id, FALSE, FALSE, FALSE, claim_date, claim_price_per_meter, rent_price_per_meter, |