merging in latest changes

indra/llcommon/llmemory.h

indra/llmath/tests/alignment_test.cpp

indra/llui/llfolderviewmodel.h

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llconversationmodel.cpp

indra/newview/llconversationmodel.h

indra/newview/llfirstuse.cpp

indra/newview/llfloaterconversationpreview.cpp

indra/newview/llfloaterconversationpreview.h

indra/newview/llfloatertranslationsettings.cpp

indra/newview/llgesturemgr.cpp

indra/newview/llimconversation.cpp

indra/newview/llimconversation.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llimview.cpp

indra/newview/lllogchat.cpp