Pull in viewer-lion to lock down next release

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llplacesfolderview.cpp b/indra/newview/llplacesfolderview.cpp
index 3caa93ae71..1cb013adc6 100755
--- a/indra/newview/llplacesfolderview.cpp
+++ b/indra/newview/llplacesfolderview.cpp
@@ -31,6 +31,7 @@
 
 #include "llplacesinventorypanel.h"
 #include "llpanellandmarks.h"
+#include "llmenugl.h"
 
 LLPlacesFolderView::LLPlacesFolderView(const LLFolderView::Params& p)
     : LLFolderView(p)
@@ -67,6 +68,16 @@ BOOL LLPlacesFolderView::handleRightMouseDown(S32 x, S32 y, MASK mask)
     return LLFolderView::handleRightMouseDown(x, y, mask);
 }
 
+void LLPlacesFolderView::updateMenu()
+{
+	LLFolderView::updateMenu();
+	LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
+	if (menu && menu->getVisible())
+	{
+		mParentLandmarksPanel->updateMenuVisibility(menu);
+	}
+}
+
 void LLPlacesFolderView::setupMenuHandle(LLInventoryType::EType asset_type, LLHandle<LLView> menu_handle)
 {
     mMenuHandlesByInventoryType[asset_type] = menu_handle;