From 13f0f72acf6f67fde27cb626307a54be780b2d90 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 15 Jul 2010 02:23:50 +0100 Subject: EXT-8325 (VWR-20161) FIXED Map button not enabled when Place Profile opened via a SLapp Enables the Map button when Place Profiles are opened from SLapps in chat history, search etc. --- indra/newview/llpanelplaces.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llpanelplaces.cpp') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 705b196ef1..9b6ab9cb74 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -1089,6 +1089,8 @@ void LLPanelPlaces::updateVerbs() if (is_place_info_visible) { + mShowOnMapBtn->setEnabled(have_3d_pos); + if (is_agent_place_info_visible) { // We don't need to teleport to the current location -- cgit v1.3 From 7a3a192f790992bbb83461c0d24036580bfc3cdc Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 15 Jul 2010 02:47:30 +0100 Subject: Tidy up LLPanelPlaces::onOverflowButtonClicked() by replacing magic strings with the existing consts --- indra/newview/llpanelplaces.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelplaces.cpp') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 9b6ab9cb74..c713bc3965 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -718,8 +718,8 @@ void LLPanelPlaces::onOverflowButtonClicked() bool is_agent_place_info_visible = mPlaceInfoType == AGENT_INFO_TYPE; if ((is_agent_place_info_visible || - mPlaceInfoType == "remote_place" || - mPlaceInfoType == "teleport_history") && mPlaceMenu != NULL) + mPlaceInfoType == REMOTE_PLACE_INFO_TYPE || + mPlaceInfoType == TELEPORT_HISTORY_INFO_TYPE) && mPlaceMenu != NULL) { menu = mPlaceMenu; -- cgit v1.3