summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2009-12-01 21:26:02 +0200
committerAndrew Dyukov <adyukov@productengine.com>2009-12-01 21:26:02 +0200
commit348518255289b950ed4786cb3108d364a00bd360 (patch)
treec27093c4976bb37dff40be0ec56deb4ed9396afc /indra/newview
parentfeef63d05f8bf9147acd9f509bf7fdae0000f7c9 (diff)
Fixed normal bug EXT-2786 (My Landmarks: context menu updates after second right-click).
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanellandmarks.cpp2
-rw-r--r--indra/newview/llpanellandmarks.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 0d45635a0e..3edb8abc73 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -378,6 +378,8 @@ void LLLandmarksPanel::initLandmarksPanel(LLInventorySubTreePanel* inventory_lis
root_folder->setupMenuHandle(LLInventoryType::IT_LANDMARK, mGearLandmarkMenu->getHandle());
}
+ root_folder->setParentLandmarksPanel(this);
+
// save initial folder state to avoid incorrect work while switching between Landmarks & Teleport History tabs
// See EXT-1609.
inventory_list->saveFolderState();
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index fa40172ecf..bee141d051 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -62,6 +62,10 @@ public:
void onSelectionChange(LLInventorySubTreePanel* inventory_list, const std::deque<LLFolderViewItem*> &items, BOOL user_action);
void onSelectorButtonClicked();
+ void setCurrentSelectedList(LLInventorySubTreePanel* inventory_list)
+ {
+ mCurrentSelectedList = inventory_list;
+ }
protected:
/**