merge from PE's viewer-trunk

indra/llui/llkeywords.cpp

indra/llui/llkeywords.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/llinventoryfunctions.h

indra/newview/llinventoryobserver.cpp

indra/newview/llinventoryobserver.h

indra/newview/llpaneloutfitedit.cpp

indra/newview/skins/default/xui/de/panel_bottomtray.xml

indra/newview/skins/default/xui/en/floater_im_session.xml

indra/newview/skins/default/xui/en/panel_bottomtray.xml

indra/newview/skins/default/xui/en/panel_outfit_edit.xml

indra/newview/skins/default/xui/en/panel_people.xml