Fixed things

BUILD.md

@@ -2,7 +2,7 @@
 
 - [cmake](https://cmake.org/download/):  3.9
 - [Qt](https://www.qt.io/download-open-source):   5.9.1
-- [OpenSSL](https://www.openssl.org/): Use the latest available version of OpenSSL to avoid security vulnerabilities.
+- [OpenSSL](https://www.openssl.org/): Use the latest available 1.0 version (**NOT** 1.1) of OpenSSL to avoid security vulnerabilities.
 - [VHACD](https://github.com/virneo/v-hacd)(clone this repository)(Optional)
 
 ### CMake External Project Dependencies

domain-server/src/DomainGatekeeper.cpp

@@ -272,22 +272,22 @@ void DomainGatekeeper::updateNodePermissions() {
             userPerms.permissions |= NodePermissions::Permission::canWriteToAssetServer;
             userPerms.permissions |= NodePermissions::Permission::canReplaceDomainContent;
         } else {
-            // this node is an agent
-            const QHostAddress& addr = node->getLocalSocket().getAddress();
-            bool isLocalUser = (addr == limitedNodeList->getLocalSockAddr().getAddress() ||
-                                addr == QHostAddress::LocalHost);
-
             // at this point we don't have a sending socket for packets from this node - assume it is the active socket
             // or the public socket if we haven't activated a socket for the node yet
             HifiSockAddr connectingAddr = node->getActiveSocket() ? *node->getActiveSocket() : node->getPublicSocket();
 
             QString hardwareAddress;
             QUuid machineFingerprint;
+            bool isLocalUser { false };
 
             DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(node->getLinkedData());
             if (nodeData) {
                 hardwareAddress = nodeData->getHardwareAddress();
                 machineFingerprint = nodeData->getMachineFingerprint();
+
+                auto sendingAddress = nodeData->getSendingSockAddr().getAddress();
+                isLocalUser = (sendingAddress == limitedNodeList->getLocalSockAddr().getAddress() ||
+                               sendingAddress == QHostAddress::LocalHost);
             }
 
             userPerms = setPermissionsForUser(isLocalUser, verifiedUsername, connectingAddr.getAddress(), hardwareAddress, machineFingerprint);

libraries/entities-renderer/src/RenderableShapeEntityItem.cpp

@@ -98,15 +98,15 @@ void ShapeEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPoint
     }
 
     _shape = entity->getShape();
+    _position = entity->getPosition();
+    _dimensions = entity->getDimensions();
+    _orientation = entity->getOrientation();
 
     if (_shape == entity::Sphere) {
         _modelTransform.postScale(SPHERE_ENTITY_SCALE);
     }
 
-
-    _position = entity->getPosition();
-    _dimensions = entity->getDimensions();
-    _orientation = entity->getOrientation();
+    _modelTransform.postScale(_dimensions);
 }
 
 bool ShapeEntityRenderer::isTransparent() const {

libraries/physics/src/CharacterController.cpp

@@ -19,7 +19,9 @@
 #include "PhysicsLogging.h"
 
 const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
-float DEFAULT_CHARACTER_GRAVITY = -5.0f;
+
+const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
+float currentAvatarGravity = DEFAULT_CHARACTER_GRAVITY;
 
 #ifdef DEBUG_STATE_CHANGE
 #define SET_STATE(desiredState, reason) setState(desiredState, reason)
@@ -357,7 +359,7 @@ void CharacterController::updateGravity() {
     if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
         _gravity = 0.0f;
     } else {
-        _gravity = DEFAULT_CHARACTER_GRAVITY;
+        _gravity = currentAvatarGravity;
     }
     if (_rigidBody) {
         _rigidBody->setGravity(_gravity * _currentUp);
@@ -366,11 +368,11 @@ void CharacterController::updateGravity() {
 
 
 void CharacterController::setGravity(float gravity) {
-    DEFAULT_CHARACTER_GRAVITY = gravity;
+    currentAvatarGravity = gravity;
 }
 
 float CharacterController::getGravity() {
-    return DEFAULT_CHARACTER_GRAVITY;
+    return currentAvatarGravity;
 }
 
 #ifdef DEBUG_STATE_CHANGE
@@ -391,6 +393,7 @@ void CharacterController::setState(State desiredState) {
     }
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 void CharacterController::updateGravity() {
@@ -406,6 +409,8 @@ void CharacterController::updateGravity() {
 }
 
 >>>>>>> 5e5b77fbaaeff61a26144a240329eca70765c1a9
+=======
+>>>>>>> 4d904bd5ce7d7b1a805c2f8fbdda630afc27576f
 void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) {
     float x = scale.x;
     float z = scale.z;