merge

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/llpanel.h

indra/llui/lluictrlfactory.cpp

indra/llui/lluictrlfactory.h

indra/llui/llview.h

indra/newview/llcompilequeue.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloaterauction.cpp

indra/newview/llfloateravatarpicker.cpp

indra/newview/llfloateravatartextures.cpp

indra/newview/llfloaterbeacons.cpp

indra/newview/llfloaterbuildoptions.cpp

indra/newview/llfloaterbulkpermission.cpp

indra/newview/llfloaterbump.cpp

indra/newview/llfloaterbuy.cpp

indra/newview/llfloaterbuycontents.cpp

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloatercolorpicker.cpp