merging latest changes

indra/llui/llfolderview.cpp

indra/llui/llfolderview.h

indra/newview/llconversationview.cpp

indra/newview/llconversationview.h

indra/newview/lldonotdisturbnotificationstorage.cpp

indra/newview/lldonotdisturbnotificationstorage.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llimview.cpp

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryfunctions.h

indra/newview/llspeakers.cpp

indra/newview/llspeakers.h

indra/newview/llspeakingindicatormanager.cpp

indra/newview/lltoastnotifypanel.cpp

indra/newview/lltoastpanel.cpp

indra/newview/llviewermessage.cpp