diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 60288db0b9..66c254fd3c 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17045,6 +17045,17 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FSTagShowDistanceColors</key>
+  <map>
+    <key>Comment</key>
+    <string>If enabled, color other avatars' nametags based on their distance</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
 
 </map>
 </llsd>
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index aec9444ad1..4dc9fb110b 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3153,6 +3153,30 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
 		name_tag_color = mClientTagData["color"]; 
 	}
 
+	// <FS:Ansariel> Color name tags based on distance
+	static LLCachedControl<bool> show_distance_color_tag(gSavedSettings, "FSTagShowDistanceColors");
+	static LLUIColor tag_chat_color = LLUIColorTable::instance().getColor("NameTagChatDistanceColor", LLColor4::green);
+	static LLUIColor tag_shout_color = LLUIColorTable::instance().getColor("NameTagShoutDistanceColor", LLColor4::yellow);
+	static LLUIColor tag_beyond_shout_color = LLUIColorTable::instance().getColor("NameTagBeyondShoutDistanceColor", LLColor4::red);
+
+	if (show_distance_color_tag && !isSelf() && !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(),FALSE,TRUE))))
+	{
+		F64 distance = dist_vec(getPositionGlobal(), gAgent.getPositionGlobal());
+		if (distance < 20.f)
+		{
+			name_tag_color = tag_chat_color;
+		}
+		else if (distance < 100.f)
+		{
+			name_tag_color = tag_shout_color;
+		}
+		else
+		{
+			name_tag_color = tag_beyond_shout_color;
+		}
+	}
+	// </FS:Ansariel>
+
 	// Rebuild name tag if state change detected
 	if (mNameString.empty()
 		|| new_name
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index e601e05fcc..62fdd04ccd 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -797,6 +797,15 @@
     <color
      name="NameTagChat"
      reference="LtGray" />
+    <color
+     name="NameTagChatDistanceColor"
+     reference="Green" />
+    <color
+     name="NameTagShoutDistanceColor"
+     reference="Yellow" />
+    <color
+     name="NameTagBeyondShoutDistanceColor"
+     reference="Red" />
     <color
      name="NameTagFriend"
      value="0.75 0.92 0.49 1.0" />
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
index 9bf63fdca8..17a7a03ddf 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -267,6 +267,16 @@
 		<check_box label="Eigene Tag-Farbe anzeigen" name="FSShowOwnTagColor_toggle" tool_tip="Aktivieren, um den eigenen Tag in der gewählten Farbe anzuzeigen."/>
 		<check_box label="Andere Farbe für Benutzernamen verwenden" name="FSColorUsername_toggle" tool_tip="Zeigt den Benutzernamen in einer anderen Farbe (übersteuert die Tag-Farbe für Benutzernamen)" width="270"/>
 		<color_swatch name="usernamecolorswatch" tool_tip="Anklicken um die Farbauswahl zu öffnen"/>
+		<check_box label="Tags-Farbe basierend auf Entfernung" name="FSTagShowDistanceColors" tool_tip="Aktivieren, um die Tag-Farbe eines Avatars abhändig von der Entfernung (Chat-Reichweite, Ruf-Reichweite, außerhalb Ruf-Reichweite) zu setzen. Übersteuert Viewertag-Farben außer Hervorhebung von Freunden und Kontakt-Set-Farben."/>
+		<text name="NameTagChatDistanceColor_Label">
+			Chat-Reichweite
+		</text>
+		<text name="NameTagShoutDistanceColor_Label">
+			Ruf-Reichweite
+		</text>
+		<text name="NameTagBeyondShoutDistanceColor_Label">
+			Außerhalb Ruf-Reichweite
+		</text>
 		<slider name="FSNameTagZOffsetCorrection" label="Z-Offset-Korrektur:" tool_tip="Ändert den Z-Offset für Avatar-Namenstags. Standardwert ist 0."/>
 	</panel>
 </tab_container>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index d9d8a4c683..613a6d2b9c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -1585,9 +1585,117 @@
          name="usernamecolorswatch"
          tool_tip="Click to open color picker"/>
 
-        <slider
+        <check_box
          left="20"
          top_pad="10"
+         follows="left|top"
+         height="16"
+         width="220"
+         label="Color nametags based on distance"
+         name="FSTagShowDistanceColors"
+		 control_name="FSTagShowDistanceColors"
+         tool_tip="When checked, the tag color of other avatars show if they are in chat range, shout range or beyond shout range. This overrides viewer tag colors, but not friend or contact set colors." />
+		 
+        <color_swatch
+         can_apply_immediately="true"
+         follows="left|top"
+         height="15"
+         label_height="0"
+         layout="topleft"
+         top_pad="5"
+         left="40"
+         name="NameTagChatDistanceColor_Color_Swatch"
+         width="15">
+            <color_swatch.init_callback
+             function="Pref.getUIColor"
+             parameter="NameTagChatDistanceColor" />
+            <color_swatch.commit_callback
+             function="Pref.applyUIColor"
+             parameter="NameTagChatDistanceColor" />
+            <color_swatch.caption_text
+             height="0" />
+        </color_swatch>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_pad="5"
+         mouse_opaque="false"
+         name="NameTagChatDistanceColor_Label"
+         top_delta="3"
+         width="95">
+            Chat range
+        </text>
+        <color_swatch
+         can_apply_immediately="true"
+         follows="left|top"
+         height="15"
+         label_height="0"
+         layout="topleft"
+         left="175"
+         name="NameTagShoutDistanceColor_Color_Swatch"
+         width="15"
+		 top_delta="-3">
+            <color_swatch.init_callback
+             function="Pref.getUIColor"
+             parameter="NameTagShoutDistanceColor" />
+            <color_swatch.commit_callback
+             function="Pref.applyUIColor"
+             parameter="NameTagShoutDistanceColor" />
+            <color_swatch.caption_text
+             height="0" />
+        </color_swatch>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_pad="5"
+         mouse_opaque="false"
+         name="NameTagShoutDistanceColor_Label"
+         top_delta="3"
+         width="95">
+            Shout range
+        </text>
+        <color_swatch
+         can_apply_immediately="true"
+         follows="left|top"
+         height="15"
+         label_height="0"
+         layout="topleft"
+         left="310"
+         name="NameTagBeyondShoutDistanceColor_Color_Swatch"
+         width="15"
+		 top_delta="-3">
+            <color_swatch.init_callback
+             function="Pref.getUIColor"
+             parameter="NameTagBeyondShoutDistanceColor" />
+            <color_swatch.commit_callback
+             function="Pref.applyUIColor"
+             parameter="NameTagBeyondShoutDistanceColor" />
+            <color_swatch.caption_text
+             height="0" />
+        </color_swatch>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_pad="5"
+         mouse_opaque="false"
+         name="NameTagBeyondShoutDistanceColor_Label"
+         top_delta="3"
+         width="150">
+            Beyond Shout range
+        </text>
+		 
+        <slider
+         left="20"
+         top_pad="15"
          name="FSNameTagZOffsetCorrection"
          control_name="FSNameTagZOffsetCorrection"
          decimal_digits="0"