diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-09 16:15:59 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-09 16:15:59 +0300 |
| commit | fcc19791b3ffc1e65de77c20d7fa441bf3c4f1ad (patch) | |
| tree | 0f56493307da5ef59cafbe19fca1a43c0bb17ed6 /indra/newview/llpanellandmarks.cpp | |
| parent | c187fdcf1fbac21cb7292d6269023eae83cb6847 (diff) | |
| parent | c70b05082f7175a43f0957fabcba1f0a2581471c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index ce1131f45c..46c64ec45b 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -522,6 +522,9 @@ void LLLandmarksPanel::setParcelID(const LLUUID& parcel_id) { if (!parcel_id.isNull()) { + //ext-4655, defensive. remove now incase this gets called twice without a remove + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(parcel_id, this); + LLRemoteParcelInfoProcessor::getInstance()->addObserver(parcel_id, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id); } |