Merge

.hgtags

indra/llplugin/llpluginclassmedia.cpp

indra/llui/llui.cpp

indra/llwindow/llwindowwin32.cpp

indra/media_plugins/cef/media_plugin_cef.cpp

indra/newview/llface.cpp

indra/newview/llface.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llpanelface.cpp

indra/newview/llpanelface.h

indra/newview/llselectmgr.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llvovolume.cpp

indra/newview/llworldmapview.cpp

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