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/lllandmarkactions.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/lllandmarkactions.h') diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h index c65b831f3e..987caf0936 100644 --- a/indra/newview/lllandmarkactions.h +++ b/indra/newview/lllandmarkactions.h @@ -35,7 +35,10 @@ #include "llinventorymodel.h" +#include "lllandmarklist.h" + class LLLandmark; + /** * @brief Provides helper functions to manage landmarks */ @@ -112,10 +115,11 @@ public: /** * @brief Retrieve a landmark from gLandmarkList by inventory item's id + * If a landmark is not currently in the gLandmarkList a callback "cb" is called when it is loaded. * * @return pointer to loaded landmark from gLandmarkList or NULL if landmark does not exist or wasn't loaded. */ - static LLLandmark* getLandmark(const LLUUID& landmarkInventoryItemID); + static LLLandmark* getLandmark(const LLUUID& landmarkInventoryItemID, LLLandmarkList::loaded_callback_t cb = NULL); /** * @brief Performs standard action of copying of SLURL from landmark to user's clipboard. -- cgit v1.2.3