merging in latest changes

.hgtags

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfolderviewitem.h

indra/newview/llchiclet.h

indra/newview/llchicletbar.cpp

indra/newview/llchicletbar.h

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationloglist.cpp

indra/newview/llconversationloglistitem.cpp

indra/newview/llconversationloglistitem.h

indra/newview/llconversationview.cpp

indra/newview/llflexibleobject.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimsession.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llimview.cpp