From 600a39c9b2169fe3f649f93b0994c67d91085c2d Mon Sep 17 00:00:00 2001
From: Matti Lahtinen <menithal@norteclabs.com>
Date: Sun, 18 Jun 2017 13:14:01 +0300
Subject: [PATCH] Fixed Zone overriding Client.

---
 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 01b5e00c65..f63990940a 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -590,7 +590,7 @@ void MyAvatar::simulate(float deltaTime) {
     auto entityTreeRenderer = qApp->getEntities();
     EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr;
     if (entityTree) {
-        bool flyingAllowed = true && _enableFlying;
+        bool flyingAllowed = true;
         bool collisionlessAllowed = true;
         entityTree->withWriteLock([&] {
             std::shared_ptr<ZoneEntityItem> zone = entityTreeRenderer->myAvatarZone();
@@ -626,7 +626,7 @@ void MyAvatar::simulate(float deltaTime) {
                 entityTree->recurseTreeWithOperator(&moveOperator);
             }
         });
-        _characterController.setFlyingAllowed(flyingAllowed);
+        _characterController.setFlyingAllowed(flyingAllowed && _enableFlying);
         _characterController.setCollisionlessAllowed(collisionlessAllowed);
     }