diff options
| author | Geenz <geenz@geenzo.com> | 2013-02-06 14:53:04 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-02-06 14:53:04 -0500 |
| commit | 5a6c0198d97d91c511b2a024db94ef27d4d67eb0 (patch) | |
| tree | 533c5018cbc62d05ef4cbb79baac505ab89f570e /indra/newview/llviewerparcelmgr.cpp | |
| parent | f3ef69ec19c3fb54d53aba1aa2ac49bc8140b591 (diff) | |
| parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) | |
Merged with latest viewer-dev.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 33f632b25d..77e382b8c7 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1540,17 +1540,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use // Actually extract the data. if (parcel) { - if (sequence_id == SELECTED_PARCEL_SEQ_ID - && 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, |