summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpick.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-10 14:04:35 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-10 14:04:35 +0100
commit17ccb6a46b680d47d267446919db94675e8182f5 (patch)
tree03ad343ad7f96e32175618dbd256d44c5842f866 /indra/newview/llpanelpick.cpp
parentc890ca021a49e52095e9a8de7db528e48c3da205 (diff)
parent8a577f1a1cf9578e5176a885b5a781bf4678e615 (diff)
(hairy) merge from viewer-release
Diffstat (limited to 'indra/newview/llpanelpick.cpp')
-rw-r--r--indra/newview/llpanelpick.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 11b51f4dd4..54eb21422e 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -210,6 +210,9 @@ void LLPanelPickInfo::sendParcelInfoRequest()
{
if (mParcelId != mRequestedId)
{
+ //ext-4655, remove now incase this gets called twice without a remove
+ LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedId, this);
+
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelId, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelId);