merge from remote repo

indra/llui/llfloaterreg.cpp

indra/llui/lllocalcliprect.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llvfs/lldir.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llchathistory.cpp

indra/newview/llchathistory.h

indra/newview/llchiclet.cpp

indra/newview/llexpandabletextbox.cpp

indra/newview/llimview.cpp

indra/newview/lljoystickbutton.cpp

indra/newview/lljoystickbutton.h

indra/newview/llnavigationbar.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnotificationhandler.h

indra/newview/llnotificationmanager.cpp