From e6efc007451ff53d8c41a0a47b19f70b9425fe44 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 13 Mar 2015 23:25:45 +0100 Subject: [PATCH] Transplant fix for MAINT-3880: Show favorite landmarks on login screen checkbox, is checked in preferences after being unchecked --- indra/newview/llpanelobjectinventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index f4cd5af8fd..cc54983ff8 100755 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -789,7 +789,7 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags) // [RLVa:KB] - Checked: 2010-09-28 (RLVa-1.2.1f) | Added: RLVa-1.2.1f items.push_back(std::string("Task Rename")); items.push_back(std::string("Task Remove")); - if (!isItemRenameable()) + if (!isItemRenameable() || (flags & FIRST_SELECTED_ITEM) == 0) { disabled_items.push_back(std::string("Task Rename")); }