Merge with tip

indra/newview/CMakeLists.txt

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llfloaterevent.cpp

indra/newview/llfloaterevent.h

indra/newview/llfolderviewitem.cpp

indra/newview/llstartup.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewerinventory.cpp

indra/newview/llviewertexture.cpp

indra/newview/llvoavatar.cpp

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

...view/skins/default/textures/windows/Volume_Background.png

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

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