From 8d65e14193374c26e20c8f22064409412711ebd4 Mon Sep 17 00:00:00 2001 From: MuteTab Date: Thu, 19 Jul 2018 14:43:46 -0700 Subject: [PATCH] Remove one change, turned out to be unnecessary. --- interface/src/avatar/MyAvatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 91be9ec4cc..69625d403f 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2822,6 +2822,7 @@ void MyAvatar::setFlyingEnabled(bool enabled) { return; } + // Flying should always be enabled for desktop users, preference may be set for HMD. _enableFlying = enabled; } @@ -2837,8 +2838,7 @@ bool MyAvatar::isInAir() { bool MyAvatar::getFlyingEnabled() { // May return true even if client is not allowed to fly in the zone. - // Should always return true if in desktop mode. - return (qApp->isHMDMode()) ? _enableFlying : true; + return _enableFlying; } // Public interface for targetscale