aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/panelradar.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-08 18:56:16 -0700
committerMcCabe Maxsted2010-08-28 05:01:08 -0700
commit260ec5d581f964ba01d2422f7ca96ad20c0baf92 (patch)
tree7de7844be0d0409758ff05e2c69512d0422cef4e /linden/indra/newview/panelradar.cpp
parentMoved 'Clear Group Cache' into the UI submenu and renamed it to 'Clear Cached... (diff)
downloadmeta-impy-260ec5d581f964ba01d2422f7ca96ad20c0baf92.zip
meta-impy-260ec5d581f964ba01d2422f7ca96ad20c0baf92.tar.gz
meta-impy-260ec5d581f964ba01d2422f7ca96ad20c0baf92.tar.bz2
meta-impy-260ec5d581f964ba01d2422f7ca96ad20c0baf92.tar.xz
WIP: show all avatars the viewer can find if you have EM privelges on the sim
Diffstat (limited to 'linden/indra/newview/panelradar.cpp')
-rw-r--r--linden/indra/newview/panelradar.cpp9
1 files changed, 8 insertions, 1 deletions
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()
175 } 175 }
176 else // avatar_ids empty 176 else // avatar_ids empty
177 { 177 {
178 // Just in case
179 if (!mAvatars.empty())
180 {
181 mAvatars.clear();
182 }
178 mRadarList->deleteAllItems(); 183 mRadarList->deleteAllItems();
179 mRadarList->addCommentText(getString("no_one_near"), ADD_TOP); 184 mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
180 LLUIString av_count_string = getString("avatars_in_plural"); 185 LLUIString av_count_string = getString("avatars_in_plural");
@@ -211,6 +216,8 @@ void PanelRadar::updateRadarDisplay()
211 F32 range = gSavedSettings.getF32("NearMeRange"); 216 F32 range = gSavedSettings.getF32("NearMeRange");
212 bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange"); 217 bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
213 bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange"); 218 bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
219 // We show avatars outside the estate even if you can't manage it in case griefers are lying on the border
220 bool is_manager = gAgent.getRegion()->canManageEstate();
214// [RLVa:KB] - Alternate: Imprudence-1.2.0 221// [RLVa:KB] - Alternate: Imprudence-1.2.0
215 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) 222 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
216 { 223 {
@@ -279,7 +286,7 @@ void PanelRadar::updateRadarDisplay()
279 } 286 }
280 287
281 // Only display avatars in range 288 // Only display avatars in range
282 if (entry->getDistance() <= range) 289 if (is_manager || entry->getDistance() <= range)
283 { 290 {
284 // Append typing string 291 // Append typing string
285 std::string typing = ""; 292 std::string typing = "";