merge

indra/llui/CMakeLists.txt

indra/llui/llbadge.cpp

indra/llui/llbadge.h

indra/llui/llbadgeholder.cpp

indra/llui/llbadgeholder.h

indra/llui/llbadgeowner.cpp

indra/llui/llbadgeowner.h

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/llsdparam.h

indra/llxuixml/llinitparam.h

indra/newview/llavataractions.cpp

indra/newview/llfloatersearch.cpp

indra/newview/llfloatersearch.h

indra/newview/llfloaterwebcontent.cpp

indra/newview/llfloaterwebcontent.h

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h