merge

indra/llprimitive/tests/llmediaentry_test.cpp

indra/llrender/llfontgl.cpp

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/lllineeditor.cpp

indra/llui/lltexteditor.cpp

indra/newview/llagentwearables.cpp

indra/newview/llchathistory.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llfolderview.cpp

indra/newview/llfoldervieweventlistener.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llnamelistctrl.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llnavigationbar.h

indra/newview/llnearbychat.cpp