From 260ec5d581f964ba01d2422f7ca96ad20c0baf92 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 8 Jun 2010 18:56:16 -0700 Subject: WIP: show all avatars the viewer can find if you have EM privelges on the sim --- linden/indra/newview/panelradar.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp index b323a77..ce91da2 100644 --- a/linden/indra/newview/panelradar.cpp +++ b/linden/indra/newview/panelradar.cpp @@ -175,6 +175,11 @@ void PanelRadar::updateRadarInfo() } else // avatar_ids empty { + // Just in case + if (!mAvatars.empty()) + { + mAvatars.clear(); + } mRadarList->deleteAllItems(); mRadarList->addCommentText(getString("no_one_near"), ADD_TOP); LLUIString av_count_string = getString("avatars_in_plural"); @@ -211,6 +216,8 @@ void PanelRadar::updateRadarDisplay() F32 range = gSavedSettings.getF32("NearMeRange"); bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange"); bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange"); + // We show avatars outside the estate even if you can't manage it in case griefers are lying on the border + bool is_manager = gAgent.getRegion()->canManageEstate(); // [RLVa:KB] - Alternate: Imprudence-1.2.0 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) { @@ -279,7 +286,7 @@ void PanelRadar::updateRadarDisplay() } // Only display avatars in range - if (entry->getDistance() <= range) + if (is_manager || entry->getDistance() <= range) { // Append typing string std::string typing = ""; -- cgit v1.1