From da88940ed74dd7b448e6a3517e06a5092384aa0c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 9 Feb 2014 14:44:43 +0100 Subject: [PATCH] Matched V2 chat header context menu behavior with RLVa default: For names that are already visible it's always possible to open the profile, even if shownames is disallowed --- indra/newview/fschathistory.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index 11b1615df8..33ca84d144 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -656,8 +656,10 @@ protected: } else { - menu->setItemEnabled("Send IM", FSCommon::checkIsActionEnabled(mAvatarID, FS_RGSTR_ACT_SEND_IM)); - menu->setItemEnabled("Show Profile", FSCommon::checkIsActionEnabled(mAvatarID, FS_RGSTR_ACT_SHOW_PROFILE)); + if (mSessionID == LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, mAvatarID)) + { + menu->setItemVisible("Send IM", false); + } menu->setItemEnabled("Teleport to", FSCommon::checkIsActionEnabled(mAvatarID, FS_RGSTR_ACT_TELEPORT_TO)); menu->setItemEnabled("Offer Teleport", LLAvatarActions::canOfferTeleport(mAvatarID)); menu->setItemEnabled("Request Teleport", LLAvatarActions::canOfferTeleport(mAvatarID));