merge

indra/llrender/llfontfreetype.cpp

indra/newview/llchathistory.cpp

indra/newview/llchiclet.cpp

indra/newview/llscriptfloater.cpp

indra/newview/llscriptfloater.h

indra/newview/llsyswellwindow.cpp

indra/newview/llsyswellwindow.h

indra/newview/llviewermedia.cpp

indra/newview/llviewermedia.h

indra/newview/llviewermessage.cpp

indra/newview/llviewerparcelmedia.cpp

indra/newview/llworldmapview.cpp

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

.../newview/skins/default/xui/en/panel_active_object_row.xml

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

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