Merge with default branch

indra/llcommon/llstring.cpp

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llspinctrl.cpp

indra/llui/llspinctrl.h

indra/llwindow/llwindowmacosx-objc.mm

indra/media_plugins/webkit/CMakeLists.txt

indra/media_plugins/webkit/linux_volume_catcher.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/Info-SecondLife.plist

indra/newview/llagentwearablesfetch.cpp

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