From 8dfee097a1b29cfeb955ca82b1c67e1f96e12aef Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 18 Jul 2014 13:51:17 +0200 Subject: [PATCH] Disable "Map" button in contacts floater if RLV prevents user from opening the world map --- indra/newview/fsfloatercontacts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index 7c9334a517..d57222d9d0 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -778,7 +778,7 @@ void FSFloaterContacts::refreshUI() LLUUID av_id = selected_item->getUUID(); mappable = (single_selected && !multiple_selected && av_id.notNull() && is_agent_mappable(av_id)); } - childSetEnabled("map_btn", mappable); + childSetEnabled("map_btn", mappable && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP)); // Set friend count LLStringUtil::format_map_t args;