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

indra/newview/llmediadataclient.cpp

indra/newview/llmediadataclient.h

indra/newview/llpanelmediasettingsgeneral.cpp

indra/newview/llpanelprimmediacontrols.cpp

indra/newview/llviewermedia.cpp

indra/newview/skins/default/textures/icons/Stop_Off.png

indra/newview/skins/default/textures/icons/UnZoom_Off.png

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

...iew/skins/default/xui/en/panel_media_settings_general.xml

...ewview/skins/default/xui/en/panel_prim_media_controls.xml

indra/newview/tests/llmediadataclient_test.cpp

install.xml