merging in latest changes

indra/newview/llfloaterimsessiontab.cpp

@@ -165,6 +165,11 @@ void LLFloaterIMSessionTab::addToHost(const LLUUID& session_id)
 					|| gSavedSettings.getBOOL("NearbyChatIsNotTornOff"))
 			{
 				floater_container->addFloater(conversp, TRUE, LLTabContainer::END);
+
+				if (!floater_container->getVisible())
+				{
+					LLFloaterReg::toggleInstanceOrBringToFront("im_container");			
+				}
 			}
 			else
 			{

indra/newview/skins/default/xui/en/panel_avatar_list_item.xml

@@ -129,6 +129,7 @@
      left_pad="3"
      right="-53"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="0"
      width="16" />

indra/newview/skins/default/xui/en/panel_group_list_item.xml

@@ -56,6 +56,7 @@
      left_pad="3"
      right="-31"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="-2"
      width="16" />