diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:04:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:04:35 +0100 |
| commit | 77330d5c3125cf3d0a2118e5731de0b1bcb7f138 (patch) | |
| tree | 03ad343ad7f96e32175618dbd256d44c5842f866 /indra/newview/llpanellandmarks.cpp | |
| parent | 83f108503aa5a34bf24ef0a167d1b76ba3800a38 (diff) | |
| parent | 8a577f1a1cf9578e5176a885b5a781bf4678e615 (diff) | |
(hairy) merge from viewer-release
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 b399e41791..6f47fc60b0 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); } |