Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public

indra/llcommon/llstring.h

indra/llui/lltextbase.cpp

indra/newview/llnamelistctrl.cpp

indra/newview/llnamelistctrl.h

indra/newview/llstatusbar.cpp

indra/newview/skins/default/textures/textures.xml

indra/newview/skins/default/textures/widgets/buy_off.png

indra/newview/skins/default/textures/widgets/buy_over.png

indra/newview/skins/default/textures/widgets/buy_press.png

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

indra/newview/viewer_manifest.py