merge

indra/llinventory/llfoldertype.cpp

indra/llmath/lloctree.h

indra/llui/llchatentry.cpp

indra/llui/llfolderview.cpp

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llwindow/lldxhardware.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/app_settings/settings.xml

indra/newview/featuretable_mac.txt

indra/newview/llagent.cpp

indra/newview/llagentcamera.cpp

indra/newview/llappviewer.cpp

indra/newview/llcolorswatch.h

indra/newview/lldrawpoolbump.cpp

indra/newview/llfloateravatarpicker.cpp

indra/newview/llfloatercolorpicker.cpp

indra/newview/llfloatertools.cpp

indra/newview/llfloaterwebcontent.cpp

indra/newview/llfloaterwebcontent.h