diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0ea26715c..476d752ea 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7735,6 +7735,17 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>RadarAlertShowDist</key>
+    <map>
+      <key>Comment</key>
+      <string>Show distance in radar announcements.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>RadarAlertSim</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index d0d75dbe6..6b47c2680 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -68,7 +68,7 @@ extern U32 gFrameCount;
 
 namespace
 {
-	void chat_avatar_status(const std::string& name, const LLUUID& key, ERadarStatType type, bool entering)
+	void chat_avatar_status(const std::string& name, const LLUUID& key, ERadarStatType type, bool entering, const F32& dist)
 	{
 		if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) return; // RLVa:LF Don't announce people are around when blind, that cheats the system.
 		static LLCachedControl<bool> radar_chat_alerts(gSavedSettings, "RadarChatAlerts");
@@ -96,6 +96,11 @@ namespace
 		if (args.find("[RANGE]") != args.end())
 			chat.mText = self->getString("template", args);
 		else if (chat.mText.empty()) return;
+		if (entering) // Note: If we decide to make this for leaving as well, change this check to dist != F32_MIN
+		{
+			static const LLCachedControl<bool> radar_show_dist("RadarAlertShowDist");
+			if (radar_show_dist) chat.mText += llformat(" (%.2fm)", dist);
+		}
 		chat.mFromName = name;
 		chat.mURL = llformat("secondlife:///app/agent/%s/about",key.asString().c_str());
 		chat.mSourceType = CHAT_SOURCE_SYSTEM;
@@ -160,7 +165,7 @@ void LLAvatarListEntry::processProperties(void* data, EAvatarProcessorType type)
 				static const LLCachedControl<U32> sAvatarAgeAlertDays(gSavedSettings, "AvatarAgeAlertDays");
 				if ((U32)mAge < sAvatarAgeAlertDays)
 				{
-					chat_avatar_status(mName, mID, STAT_TYPE_AGE, mStats[STAT_TYPE_AGE] = true);
+					chat_avatar_status(mName, mID, STAT_TYPE_AGE, mStats[STAT_TYPE_AGE] = true, (mPosition - gAgent.getPositionGlobal()).magVec());
 				}
 			}
 			// If one wanted more information that gets displayed on profiles to be displayed, here would be the place to do it.
@@ -168,14 +173,18 @@ void LLAvatarListEntry::processProperties(void* data, EAvatarProcessorType type)
 	}
 }
 
-void LLAvatarListEntry::setPosition(const LLVector3d& position, bool this_sim, bool drawn, bool chatrange, bool shoutrange)
+void LLAvatarListEntry::setPosition(const LLVector3d& position, const F32& dist, bool drawn)
 {
 	mPosition = position;
 	mFrame = gFrameCount;
-	if (this_sim != mStats[STAT_TYPE_SIM])			chat_avatar_status(mName, mID, STAT_TYPE_SIM, mStats[STAT_TYPE_SIM] = this_sim);
-	if (drawn != mStats[STAT_TYPE_DRAW])			chat_avatar_status(mName, mID, STAT_TYPE_DRAW, mStats[STAT_TYPE_DRAW] = drawn);
-	if (shoutrange != mStats[STAT_TYPE_SHOUTRANGE])	chat_avatar_status(mName, mID, STAT_TYPE_SHOUTRANGE, mStats[STAT_TYPE_SHOUTRANGE] = shoutrange);
-	if (chatrange != mStats[STAT_TYPE_CHATRANGE])	chat_avatar_status(mName, mID, STAT_TYPE_CHATRANGE, mStats[STAT_TYPE_CHATRANGE] = chatrange);
+	bool here(dist != F32_MIN); // F32_MIN only if dead
+	bool this_sim(here && (gAgent.getRegion()->pointInRegionGlobal(position) || !(LLWorld::getInstance()->positionRegionValidGlobal(position))));
+	if (this_sim != mStats[STAT_TYPE_SIM])			chat_avatar_status(mName, mID, STAT_TYPE_SIM, mStats[STAT_TYPE_SIM] = this_sim, dist);
+	if (drawn != mStats[STAT_TYPE_DRAW])			chat_avatar_status(mName, mID, STAT_TYPE_DRAW, mStats[STAT_TYPE_DRAW] = drawn, dist);
+	bool shoutrange(here && dist < LFSimFeatureHandler::getInstance()->shoutRange());
+	if (shoutrange != mStats[STAT_TYPE_SHOUTRANGE])	chat_avatar_status(mName, mID, STAT_TYPE_SHOUTRANGE, mStats[STAT_TYPE_SHOUTRANGE] = shoutrange, dist);
+	bool chatrange(here && dist < LFSimFeatureHandler::getInstance()->sayRange());
+	if (chatrange != mStats[STAT_TYPE_CHATRANGE])	chat_avatar_status(mName, mID, STAT_TYPE_CHATRANGE, mStats[STAT_TYPE_CHATRANGE] = chatrange, dist);
 	mUpdateTimer.start();
 }
 
@@ -553,8 +562,7 @@ void LLFloaterAvatarList::updateAvatarList()
 			}
 
 			// Announce position
-			F32 dist((position - mypos).magVec());
-			entry->setPosition(position, gAgent.getRegion()->pointInRegionGlobal(position) || !(LLWorld::getInstance()->positionRegionValidGlobal(position)), avatarp, dist < LFSimFeatureHandler::getInstance()->sayRange(), dist < LFSimFeatureHandler::getInstance()->shoutRange());
+			entry->setPosition(position, (position - mypos).magVec(), avatarp);
 
 			// Mark as typing if they are typing
 			if (avatarp && avatarp->isTyping()) entry->setActivity(LLAvatarListEntry::ACTIVITY_TYPING);
@@ -621,7 +629,7 @@ void LLFloaterAvatarList::expireAvatarList()
 		}
 		else
 		{
-			entry->setPosition(entry->getPosition(), false, false, false, false); // Dead and gone
+			entry->setPosition(entry->getPosition(), F32_MIN, false); // Dead and gone
 			it = mAvatars.erase(it);
 		}
 	}
diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
index 222107c12..d77231509 100644
--- a/indra/newview/llfloateravatarlist.h
+++ b/indra/newview/llfloateravatarlist.h
@@ -80,7 +80,7 @@ enum ACTIVITY_TYPE
 	 * Update world position.
 	 * Affects age.
 	 */	
-	void setPosition(const LLVector3d& position, bool this_sim, bool drawn, bool chatrange, bool shoutrange);
+	void setPosition(const LLVector3d& position, const F32& dist, bool drawn);
 
 	const LLVector3d& getPosition() const { return mPosition; }
 
diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml
index 2f06bbf3c..624b577c6 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -119,6 +119,10 @@
       <on_check control="RadarAlertAge"/>
     </menu_item_check>
     <menu_item_separator/>
+    <menu_item_check label="Include distance in alerts" name="Include distance in alerts">
+      <on_click function="ToggleControl" userdata="RadarAlertShowDist"/>
+      <on_check control="RadarAlertShowDist"/>
+    </menu_item_check>
     <menu_item_check label="Announce even when closed" name="Announce even when closed">
       <on_click function="ToggleControl" userdata="RadarKeepOpen"/>
       <on_check control="RadarKeepOpen"/>