diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index f1a04810f9..f9361901e9 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -534,8 +534,10 @@ LLPanelPeople::LLPanelPeople()
 		// <FS:Ansariel> Firestorm radar
 		//mMiniMap(NULL)
 		mMiniMap(NULL),
-		mRadarPanel(NULL)
+		mRadarPanel(NULL),
 		// </FS:Ansariel> Firestorm radar
+		// <FS:Ansariel> FIRE-4740: Friend counter in people panel
+		mFriendsTabContainer(NULL)
 {
 	mFriendListUpdater = new LLFriendListUpdater(boost::bind(&LLPanelPeople::updateFriendList,	this));
 	// <FS:Ansariel> Firestorm radar
@@ -641,6 +643,8 @@ BOOL LLPanelPeople::postBuild()
     friends_tab->setVisibleCallback(boost::bind(&LLPanelPeople::removePicker, this));
 	friends_tab->setVisibleCallback(boost::bind(&LLPanelPeople::updateFacebookList, this, _2));
 
+	// <FS:Ansariel> FIRE-4740: Friend counter in people panel
+	mFriendsTabContainer = friends_tab->findChild<LLTabContainer>("friends_accordion");
 	// <FS:Ansariel> Firestorm radar
 	friends_tab->childSetAction("GlobalOnlineStatusToggle", boost::bind(&LLPanelPeople::onGlobalVisToggleButtonClicked, this));
 	mOnlineFriendList = friends_tab->getChild<LLAvatarList>("avatars_online");
@@ -878,6 +882,17 @@ void LLPanelPeople::updateFriendList()
 	updateButtons();
 	updateSuggestedFriendList();
 	showFriendsAccordionsIfNeeded();
+
+	// <FS:Ansariel> FIRE-4740: Friend counter in people panel
+	if (mFriendsTabContainer)
+	{
+		LLStringUtil::format_map_t args;
+		args["ALL"] = llformat("%d", all_friendsp.size());
+		args["ONLINE"] = llformat("%d", online_friendsp.size());
+		mFriendsTabContainer->setPanelTitle(0, getString("OnlineFriendsTitle", args));
+		mFriendsTabContainer->setPanelTitle(1, getString("AllFriendsTitle", args));
+	}
+	// </FS:Ansariel>
 }
 
 bool LLPanelPeople::updateSuggestedFriendList()
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 9469f084e8..cbfd0a512f 100755
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -162,6 +162,8 @@ private:
 	LLAvatarList*			mRecentList;
 	LLGroupList*			mGroupList;
 	LLNetMap*				mMiniMap;
+	// <FS:Ansariel> FIRE-4740: Friend counter in people panel
+	LLTabContainer*			mFriendsTabContainer;
 
 	std::vector<std::string> mSavedOriginalFilters;
 	std::vector<std::string> mSavedFilters;
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index 66a128cd13..f5cbd6b307 100755
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -20,6 +20,12 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Verd
 	<string name="no_groups_msg" value="Leder du efter grupper at være med i? Prøv [secondlife:///app/search/groups Søg]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Dobbeltklik for at åbne kort, træk for at panorere)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Dobbelt-klik fot at teleportere, træk for at panorere)"/>
+	<string name="AllFriendsTitle">
+		Alle ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Online ([ONLINE])
+	</string>
 	<filter_editor label="Filtrér" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="TÆT PÅ" name="nearby_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 5320ae7056..df4ae094b9 100755
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -31,6 +31,12 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="pseudonyms">
 		Aliase
 	</string>
+	<string name="AllFriendsTitle">
+		Alle ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Online ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="In der Nähe" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index c3d4b6e5eb..db77fd8b6f 100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -72,6 +72,14 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      name="pseudonyms">
     Aliases
     </panel.string>
+    <panel.string
+     name="AllFriendsTitle">
+    All ([ALL])
+    </panel.string>
+    <panel.string
+     name="OnlineFriendsTitle">
+    Online ([ONLINE])
+    </panel.string>
 
     <tab_container
      bottom="-10"
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 7e23e09bde..2b17db7839 100755
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -19,6 +19,12 @@
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
+	<string name="AllFriendsTitle">
+		Todos ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Conectados ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="Cercana" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index e306a00183..12a7b7adc0 100755
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -18,6 +18,12 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
+	<string name="AllFriendsTitle">
+		Tout ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		En ligne ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index 2f40d4bdc4..e501ccc936 100755
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -18,6 +18,12 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
+	<string name="AllFriendsTitle">
+		Tutto ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Online ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 82b280b1fd..bdc5334499 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -23,7 +23,13 @@
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	
+	<string name="AllFriendsTitle">
+		全員（[ALL]）
+	</string>
+	<string name="OnlineFriendsTitle">
+		オンライン（[ONLINE]）
+	</string>
+
 	<tab_container name="tabs">
 	
 	<!--  NEARBY tab  -->
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
index d2b63d5b63..602a69b601 100755
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -30,6 +30,12 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
 	<panel.string name="pseudonyms">
 		Aliasy
 	</panel.string>
+	<string name="AllFriendsTitle">
+		Wszyscy ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Dostępni ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="W pobliżu" name="nearby_panel">
 			<panel name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index 205fd6b97d..05d20c3291 100755
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -18,6 +18,12 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
+	<string name="AllFriendsTitle">
+		Todos ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Online ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 9606f0aec1..f1578f9637 100755
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -18,6 +18,12 @@
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
+	<string name="AllFriendsTitle">
+		Все ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Онлайн ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index b499ec8307..e494c1a336 100755
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -18,6 +18,12 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
+	<string name="AllFriendsTitle">
+		Tümü ([ALL])
+	</string>
+	<string name="OnlineFriendsTitle">
+		Çevrimiçi ([ONLINE])
+	</string>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index da5918d553..2969db68ed 100755
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -18,6 +18,12 @@
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<string name="AllFriendsTitle">
+		全部（[ALL]）
+	</string>
+	<string name="OnlineFriendsTitle">
+		上線（[ONLINE]）
+	</string>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">