Merge branch 'ryzom/ui/improvements' into atys

code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp

@@ -466,16 +466,13 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				CViewBitmap *rp3 = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_3"));
 				CViewBitmap *rp4 = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_4"));
 
-				if (pPlayer == NULL || (pPlayer != NULL && pPlayer->getPvpMode() & PVP_MODE::PvpFaction))
-				{
-					if (rp1) rp1->setTexture(entityTag1.toString());
-					if (rp2) rp2->setTexture(entityTag2.toString());
-				}
-				else
-				{
-					entityTag1.clear();
-					entityTag2.clear();
-				}
+				if (entityTag1.toString() == "_") entityTag1.clear();
+				if (entityTag2.toString() == "_") entityTag2.clear();
+				if (entityTag3.toString() == "_") entityTag3.clear();
+				if (entityTag4.toString() == "_") entityTag4.clear();
+
+				if (rp1) rp1->setTexture(entityTag1.toString());
+				if (rp2) rp2->setTexture(entityTag2.toString());
 				if (rp3) rp3->setTexture(entityTag3.toString());
 				if (rp4) rp4->setTexture(entityTag4.toString());