diff options
| author | prep <prep@lindenlab.com> | 2013-02-13 11:30:36 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-02-13 11:30:36 -0500 |
| commit | 11d12f1a99c8ef256299f601cd0ad6604e2178c5 (patch) | |
| tree | bdf5ee8d47f05275cf384395ae8a0d083bf45bc6 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 2665106aebc4fde975aa13f5c093637e4d9d30ad (diff) | |
| parent | 79eeae502c4965a6091614f774aa68ba7837742a (diff) | |
Merge from viewer-beta
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 5da1561afe..4cdb568d17 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, |