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/llpanelplaceinfo.cpp | |
parent | c187fdcf1fbac21cb7292d6269023eae83cb6847 (diff) | |
parent | c70b05082f7175a43f0957fabcba1f0a2581471c (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelplaceinfo.cpp')
-rw-r--r-- | indra/newview/llpanelplaceinfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 99e48cca6d..10e2c1e080 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -133,6 +133,10 @@ void LLPanelPlaceInfo::sendParcelInfoRequest() { if (mParcelID != mRequestedID) { + //ext-4655, defensive. remove now incase this gets called twice without a remove + //as panel never closes its ok atm (but wrong :) + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedID, this); + LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID); |