Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

indra/newview/llcurrencyuimanager.cpp

indra/newview/llface.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloatersearch.cpp

indra/newview/llviewertexture.cpp

indra/newview/llviewertexture.h

indra/newview/llvoiceclient.cpp

indra/newview/llvoiceclient.h

indra/newview/llvopartgroup.cpp

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