Merge

indra/llui/llfloaterreg.cpp

indra/newview/CMakeLists.txt

indra/newview/llavataractions.cpp

indra/newview/llchathistory.cpp

indra/newview/llchathistory.h

indra/newview/llchiclet.cpp

indra/newview/llimview.cpp

indra/newview/lljoystickbutton.cpp

indra/newview/lljoystickbutton.h

indra/newview/llnearbychat.cpp

indra/newview/llnotificationhandler.h

indra/newview/llnotificationmanager.cpp

indra/newview/llnotificationofferhandler.cpp

indra/newview/llnotificationscripthandler.cpp

indra/newview/llpanelgroup.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpick.cpp

indra/newview/llpanelplaceprofile.cpp

indra/newview/llpanelteleporthistory.cpp