merge

indra/newview/llagentcamera.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llavataractions.cpp

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llbrowsernotification.cpp

indra/newview/llbuycurrencyhtml.cpp

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llcolorswatch.cpp

indra/newview/llcommandhandler.cpp

indra/newview/llcommandlineparser.cpp

indra/newview/lldirpicker.cpp

indra/newview/lldirpicker.h

indra/newview/llfavoritesbar.cpp

indra/newview/llfavoritesbar.h