svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

indra/llcharacter/llvisualparam.h

indra/llcommon/llstring.h

indra/llimage/llimage.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llinventory/llpermissions.cpp

indra/llinventory/llpermissions.h

indra/llmessage/lltransfertargetfile.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/llprimitive.h

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llcheckboxctrl.cpp

indra/llui/llcheckboxctrl.h

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h