From 0965bc576cea34e9e2bc56a5c086060a9d1d6951 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 18 Jun 2015 23:52:26 -0400 Subject: [PATCH] Port alchemy fixy: Make the radar not spam the end-user on teleport Thanks to Sim Federal of Alchemy Viewer Team --- indra/newview/llfloateravatarlist.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index d37a86bd0..bb75b4543 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -76,9 +76,16 @@ namespace { void chat_avatar_status(const std::string& name, const LLUUID& key, ERadarStatType type, bool entering, const F32& dist) { - if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS)) return; // RLVa:LF Don't announce people are around when blind, that cheats the system. static LLCachedControl radar_chat_alerts(gSavedSettings, "RadarChatAlerts"); if (!radar_chat_alerts) return; + // + // If we're teleporting, we don't want to see the radar's alerts about EVERY agent leaving. + if (!entering && gAgent.getTeleportState() != LLAgent::TELEPORT_NONE) + { + return; + } + // + if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS)) return; // RLVa:LF Don't announce people are around when blind, that cheats the system. static LLCachedControl radar_alert_sim(gSavedSettings, "RadarAlertSim"); static LLCachedControl radar_alert_draw(gSavedSettings, "RadarAlertDraw"); static LLCachedControl radar_alert_shout_range(gSavedSettings, "RadarAlertShoutRange");