merge late fix for SOCIAL-778 into 2.6.1 for release

.hgtags

BuildParams

doc/contributions.txt

indra/llcommon/llversionviewer.h

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llmenugl.cpp

indra/newview/llfloatermap.cpp

indra/newview/llfloatermap.h

indra/newview/llnearbychatbar.cpp

indra/newview/llnearbychatbar.h

indra/newview/llnetmap.cpp

indra/newview/llsidetray.cpp

indra/newview/lltracker.h

indra/newview/llviewermessage.cpp

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

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

indra/newview/skins/default/xui/es/panel_landmark_info.xml

indra/newview/skins/default/xui/es/panel_place_profile.xml