1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 25672db318..aca8cf189b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -160,6 +160,7 @@ public:
             mAvatarsPositions[*id_it] = *pos_it;
         }
     };
+    const id_to_pos_map_t& getAvatarsPositions() const { return mAvatarsPositions; }
 
 protected:
     virtual bool doCompare(const LLAvatarListItem* item1, const LLAvatarListItem* item2) const
@@ -841,10 +842,15 @@ void LLPanelPeople::updateNearbyList()
 
     std::vector<LLVector3d> positions;
 
-    LLWorld::getInstance()->getAvatars(&mNearbyList->getIDs(), &positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("NearMeRange"));
+    LLWorld::getInstance()->getAvatars(&mNearbyList->getIDs(), &positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("MPVNearMeRange"));
     mNearbyList->setDirty();
+#ifdef LL_DISCORD
+    if (gSavedSettings.getBOOL("EnableDiscord"))
+        LLAppViewer::updateDiscordPartyMaxSize(mNearbyList->getIDs().size());
+#endif
 
     DISTANCE_COMPARATOR.updateAvatarsPositions(positions, mNearbyList->getIDs());
+    gAgent.setAvatarsPositions(DISTANCE_COMPARATOR.getAvatarsPositions());
     LLActiveSpeakerMgr::instance().update(true);
 }
 
@@ -1127,6 +1133,12 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLUICtrl* ctrl)
 #if 0 // SJB: Useful for testing, but not currently functional or to spec
     LLAvatarActions::showProfile(clicked_id);
 #else // spec says open IM window
+    if (item->getParentUICtrl()->getParentUICtrl() == mNearbyList
+        && gSavedSettings.getBOOL("DoubleClickZoomIn"))
+    {
+        handle_zoom_to_object(clicked_id);
+        return;
+    }
     LLAvatarActions::startIM(clicked_id);
 #endif
 }
@@ -1559,7 +1571,7 @@ bool LLPanelPeople::updateNearbyArrivalTime()
 {
     std::vector<LLVector3d> positions;
     std::vector<LLUUID> uuids;
-    static LLCachedControl<F32> range(gSavedSettings, "NearMeRange");
+    static LLCachedControl<F32> range(gSavedSettings, "MPVNearMeRange");
     LLWorld::getInstance()->getAvatars(&uuids, &positions, gAgent.getPositionGlobal(), range);
     LLRecentPeople::instance().updateAvatarsArrivalTime(uuids);
     return LLApp::isExiting();