merge

indra/llui/llcallbackmap.h

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/lluictrl.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/llavatarlistitem.cpp

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llchatbar.cpp

indra/newview/llcofwearables.cpp

indra/newview/llcofwearables.h

indra/newview/llcompilequeue.cpp

indra/newview/llcurrencyuimanager.cpp

indra/newview/llfloateranimpreview.cpp

indra/newview/llfloateranimpreview.h

indra/newview/llfloaterauction.cpp

indra/newview/llfloateravatarpicker.cpp

indra/newview/llfloaterbuy.cpp

indra/newview/llfloaterbuycontents.cpp