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

This commit is contained in:
Daniela 2017-11-29 18:59:35 +00:00
commit 07c0610533

View file

@ -194,7 +194,7 @@ private:
bool _overrideHands { false };
mutable std::recursive_mutex _lock;
bool _hmdTrackingEnabled { false };
bool _hmdTrackingEnabled { true };
QString configToString(Config config);
friend class ViveControllerManager;