Merge branch 'master' of github.com:highfidelity/hifi into rig

This commit is contained in:
Seth Alves 2015-08-04 16:13:58 -07:00
commit c3fc1d5391

View file

@ -24,7 +24,8 @@
ControllerScriptingInterface::ControllerScriptingInterface() :
_mouseCaptured(false),
_touchCaptured(false),
_wheelCaptured(false)
_wheelCaptured(false),
_actionsCaptured(false)
{
}