From f3c53a84d3e4605546fbe038ad8a2b863d2cc399 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 19 Nov 2009 22:38:27 +0200 Subject: Fixed normal bug EXT-2348 "My Landmarks: Show On Map does nothing for landmarks from Library" - Added callback to ensure that a landmark is loaded from the global landmark list. - Added disabling "Map" button to indicate that a landmark info is being loaded. --HG-- branch : product-engine --- indra/newview/llpanellandmarks.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanellandmarks.h') diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 097d79badf..777ee562d2 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -37,6 +37,7 @@ // newview #include "llinventorymodel.h" +#include "lllandmarklist.h" #include "llpanelplacestab.h" #include "llpanelpick.h" #include "llremoteparcelrequest.h" @@ -68,7 +69,7 @@ protected: */ bool isLandmarkSelected() const; bool isReceivedFolderSelected() const; - LLLandmark* getCurSelectedLandmark() const; + void doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb); LLFolderViewItem* getCurSelectedItem() const; void updateSortOrder(LLInventoryPanel* panel, bool byDate); @@ -127,6 +128,16 @@ private: */ void updateFilteredAccordions(); + /** + * Landmark actions callbacks. Fire when a landmark is loaded from the list. + */ + void doShowOnMap(LLLandmark* landmark); + void doProcessParcelInfo(LLLandmark* landmark, + LLFolderViewItem* cur_item, + LLInventoryItem* inv_item, + const LLParcelData& parcel_data); + void doCreatePick(LLLandmark* landmark); + private: LLInventorySubTreePanel* mFavoritesInventoryPanel; LLInventorySubTreePanel* mLandmarksInventoryPanel; -- cgit v1.2.3