Merge with tip

indra/llcharacter/llcharacter.cpp

indra/llui/llconsole.cpp

indra/llui/llconsole.h

indra/llui/llmultisliderctrl.cpp

indra/llui/lltabcontainer.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagentui.cpp

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llchathistory.cpp

indra/newview/lldrawpoolalpha.cpp

indra/newview/llface.cpp

indra/newview/llface.h

indra/newview/llfavoritesbar.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloatergesture.cpp

indra/newview/llfloaternotificationsconsole.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloaterproperties.cpp