slightly hairy merge from viewer-trunk

indra/llmessage/llcachename.cpp

indra/llui/lldraghandle.cpp

indra/llui/llfloater.cpp

indra/llwindow/llwindowwin32.cpp

indra/media_plugins/webkit/CMakeLists.txt

indra/media_plugins/webkit/mac_volume_catcher.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llagentwearablesfetch.cpp

indra/newview/llagentwearablesfetch.h

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llcallfloater.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llchiclet.cpp