From 18c39edba9e48c43bf350d36d5ebd157d2ffe85b Mon Sep 17 00:00:00 2001
From: Secret Foxtail <remmy@megapahit.net>
Date: Wed, 6 Aug 2025 03:57:47 -0600
Subject: Retire MPVNearMeRange

Use NearMeRange to minimize difference with SLv
---
 indra/newview/app_settings/settings.xml | 11 -----------
 indra/newview/llpanelpeople.cpp         |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7ada2925bf..4305aa0a33 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14358,17 +14358,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>MPVNearMeRange</key>
-    <map>
-      <key>Comment</key>
-      <string>Search radius in the people panel</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <integer>4096</integer>
-    </map>
     <key>RenderVSyncEnabled</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index aca8cf189b..01541968de 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -842,7 +842,7 @@ void LLPanelPeople::updateNearbyList()
 
     std::vector<LLVector3d> positions;
 
-    LLWorld::getInstance()->getAvatars(&mNearbyList->getIDs(), &positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("MPVNearMeRange"));
+    LLWorld::getInstance()->getAvatars(&mNearbyList->getIDs(), &positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("NearMeRange"));
     mNearbyList->setDirty();
 #ifdef LL_DISCORD
     if (gSavedSettings.getBOOL("EnableDiscord"))
@@ -1571,7 +1571,7 @@ bool LLPanelPeople::updateNearbyArrivalTime()
 {
     std::vector<LLVector3d> positions;
     std::vector<LLUUID> uuids;
-    static LLCachedControl<F32> range(gSavedSettings, "MPVNearMeRange");
+    static LLCachedControl<F32> range(gSavedSettings, "NearMeRange");
     LLWorld::getInstance()->getAvatars(&uuids, &positions, gAgent.getPositionGlobal(), range);
     LLRecentPeople::instance().updateAvatarsArrivalTime(uuids);
     return LLApp::isExiting();
-- 
cgit v1.2.3