merging latest changes

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/newview/app_settings/settings.xml

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationmodel.cpp

indra/newview/llconversationmodel.h

indra/newview/llfloaterconversationlog.cpp

indra/newview/llfloaterconversationlog.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychat.h

indra/newview/llfloaterimnearbychathandler.cpp

indra/newview/llfloaterimsession.cpp

indra/newview/llfloaterimsession.h

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llimview.cpp