summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.cpp
diff options
context:
space:
mode:
authorgabriel lee <gabriel@lindenlab.com>2010-08-09 12:44:28 +0100
committergabriel lee <gabriel@lindenlab.com>2010-08-09 12:44:28 +0100
commitc70b05082f7175a43f0957fabcba1f0a2581471c (patch)
tree92cd90dfebdbf29a265f8dfc35e0ac7230c85e82 /indra/newview/llpanellandmarks.cpp
parentbcd84433717e42ec8675009e1335caf915cc1a41 (diff)
patching from fixes made in dessie/viewer-release
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r--indra/newview/llpanellandmarks.cpp3
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);
}