From 32cce392ac099676ea49b104abc8a6e69ae8b7fd Mon Sep 17 00:00:00 2001 From: thickbrick Date: Tue, 28 Sep 2010 19:06:14 +0200 Subject: Fix missing "Open" in context menu on notecards in inventory. This was introduced in d9c9fbdd0d4c2638b3aab5b2db0f8cf6d48a928e (windlight notecards) --- linden/indra/newview/llinventorybridge.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 30b0a4a..0f999fc 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp @@ -3107,7 +3107,27 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags) } items.push_back(std::string("Edit WindLight Settings")); } + else + { + items.push_back(std::string("Open")); + } items.push_back(std::string("Properties")); + + // RLVa stuff copied from LLInvFVBridge::buildContextMenu + // [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c + if (rlv_handler_t::isEnabled()) + { + LLInventoryObject* pItem = (mInventoryPanel->getModel()) ? mInventoryPanel->getModel()->getObject(mUUID) : NULL; + if ( (pItem) && + ( ((LLAssetType::AT_NOTECARD == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))) || + ((LLAssetType::AT_LSL_TEXT == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT))) || + ((LLAssetType::AT_NOTECARD == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))) ) ) + { + disabled_items.push_back(std::string("Open")); + } + } + // [/RLVa:KB] + getClipboardEntries(true, items, disabled_items, flags); } hideContextEntries(menu, items, disabled_items); -- cgit v1.1