diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
index 76792cc6fd..1eafc5bd64 100644
--- a/indra/newview/llpanelgroupbulk.cpp
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -387,7 +387,7 @@ void LLPanelGroupBulk::addUsers(uuid_vec_t& agent_ids)
 			} 
 			else 
 			{
-				LL_WARNS() << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << LL_ENDL;
+				llwarns << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << llendl;
 				names.push_back("(Unknown)");
 			}
 		}
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 3227333e96..e662a05dfc 100755
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -501,9 +501,7 @@ void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids)
 			//looks like user try to invite offline friend
 			//for offline avatar_id gObjectList.findObject() will return null
 			//so we need to do this additional search in avatar tracker, see EXT-4732
-			// <FS:Ansariel> FIRE-4140: Group invite button on profile sometimes doesn't work
-			//if (LLAvatarTracker::instance().isBuddy(agent_id))
-			// </FS:Ansariel>
+			if (LLAvatarTracker::instance().isBuddy(agent_id))
 			{
 				LLAvatarName av_name;
 				if (!LLAvatarNameCache::get(agent_id, &av_name))
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index aaaae5e8c0..a97134919e 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -2049,7 +2049,7 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg)
 	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
 	if(!gdatap)
 	{
-		LL_WARNS() << "Unable to get group data for group " << mGroupID << LL_ENDL;
+		llwarns << "Unable to get group data for group " << mGroupID << llendl;
 		return false;
 	}
 
@@ -2477,8 +2477,8 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLUICtrl* ctrl, bool force)
 		}
 		else
 		{
-			LL_WARNS() << "Unable to look up role information for role id: "
-				<< role_id << LL_ENDL;
+			llwarns << "Unable to look up role information for role id: "
+				<< role_id << llendl;
 		}
 		
 		//////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index b2ff285719..49daf6c9f2 100755
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -19,7 +19,7 @@
 		Vælg hvilken rolle, du vil tildele dem:
 	</text>
 	<combo_box name="role_name" tool_tip="Vælg fra en liste med roller du har ret til at tildele medlemmer"/>
-	<button label="Send invitationer" name="invite_button"/>
+	<button label="Send invitationer" name="ok_button"/>
 	<button label="Annullér" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Gruppe invitation
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 2c2d75d314..2077c2e660 100755
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Wählen Sie eine Rolle aus:
 	</text>
 	<combo_box name="role_name" tool_tip="Wählen Sie aus der Liste der Rollen, die Sie an Mitglieder vergeben dürfen."/>
-	<button label="Einladungen versenden" name="invite_button"/>
+	<button label="Einladungen versenden" name="ok_button"/>
 	<button label="Abbr." name="cancel_button"/>
 	<string name="GroupInvitation">
 		Gruppeneinladung
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 393b9f6e67..5a1d39969a 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -334,14 +334,14 @@ things in this group. There&apos;s a broad variety of Abilities.
     <panel
      border="false"
      height="303"
-     label="Banned Residents"
+     label="Banned Agents"
      layout="topleft"
      left="0"
      right="-1"
      help_topic="roles_banlist_tab"
      name="banlist_sub_tab"
      class="panel_group_banlist_subtab"
-     tool_tip="View the banned residents from this group."
+     tool_tip="View the banned agents from this group."
      width="310">
       <panel.string
        name="help_text">
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index d6c2ee7b8f..319e9d0f1b 100755
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Elegir qué rol asignarles:
 	</text>
 	<combo_box name="role_name" tool_tip="Elige el rol de entre la lista de aquellos que estás autorizado a asignar"/>
-	<button label="Enviar las invitaciones" name="invite_button"/>
+	<button label="Enviar las invitaciones" name="ok_button"/>
 	<button label="Cancelar" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Invitar al grupo
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index d53af3167e..d792439220 100755
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Assignez-leur un rôle :
 	</text>
 	<combo_box name="role_name" tool_tip="Choisissez dans la liste de rôles que vous êtes autorisé(e) à attribuer aux membres"/>
-	<button label="Envoyer les invitations" name="invite_button"/>
+	<button label="Envoyer les invitations" name="ok_button"/>
 	<button label="Annuler" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Invitations au groupe
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
index a3abcf5951..1b57eba3f0 100755
--- a/indra/newview/skins/default/xui/it/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Scegli che ruolo assegnare loro:
 	</text>
 	<combo_box name="role_name" tool_tip="Scegli dall&apos;elenco dei ruoli ai quali ti è consentito assegnare i membri"/>
-	<button label="Manda gli inviti" name="invite_button"/>
+	<button label="Manda gli inviti" name="ok_button"/>
 	<button label="Annulla" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Invito di gruppo
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index eb45fdba6a..cc9ebc405b 100755
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		割り当て先の役割を選択：
 	</text>
 	<combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください"/>
-	<button label="招待を送信" name="invite_button"/>
+	<button label="招待を送信" name="ok_button"/>
 	<button label="取り消し" name="cancel_button"/>
 	<string name="GroupInvitation">
 		グループへの招待
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
index 5be92e46f0..ba54ef27a3 100755
--- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Wybierz funkcję dla nowej osoby:
 	</text>
 	<combo_box name="role_name" tool_tip="Wybierz rolę z listy funkcji, które możesz przypisać osobom w grupie"/>
-	<button label="Wyślij zaproszenia" name="invite_button"/>
+	<button label="Wyślij zaproszenia" name="ok_button"/>
 	<button label="Anuluj" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Zaproszenie do grupy
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index a1d4f60eb1..de057481de 100755
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Escolha que Função atribuir a eles:
 	</text>
 	<combo_box name="role_name" tool_tip="Selecione o cargo da lista de cargos que você pode designar a membros"/>
-	<button label="Mandar convites" name="invite_button"/>
+	<button label="Mandar convites" name="ok_button"/>
 	<button label="Cancelar" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Convite
diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
index 46424c168b..68dac5cd7e 100755
--- a/indra/newview/skins/default/xui/ru/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Выберите назначаемую им роль:
 	</text>
 	<combo_box name="role_name" tool_tip="Выберите в списке роли, которые вы можете назначать участникам"/>
-	<button label="Отправить приглашения" name="invite_button"/>
+	<button label="Отправить приглашения" name="ok_button"/>
 	<button label="Отмена" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Групповое приглашение
diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
index 77c4db2cdc..4ba5761edb 100755
--- a/indra/newview/skins/default/xui/tr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Onları hala Role atayacağınızı seçin:
 	</text>
 	<combo_box name="role_name" tool_tip="Üyeleri atamanıza izin verilen Roller listesinden seçin"/>
-	<button label="Davetiye Gönder" name="invite_button"/>
+	<button label="Davetiye Gönder" name="ok_button"/>
 	<button label="İptal" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Grup Davetiyesi
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 250bbaab6a..8921978b20 100755
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		選擇指派給他們的角色：
 	</text>
 	<combo_box name="role_name" tool_tip="從角色清單選擇你有權指派給成員的角色："/>
-	<button label="送出邀請" name="invite_button"/>
+	<button label="送出邀請" name="ok_button"/>
 	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
 		群組邀請