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

interface/src/avatar/MyAvatar.cpp

@@ -959,6 +959,18 @@ void MyAvatar::restoreRoleAnimation(const QString& role) {
     _skeletonModel->getRig().restoreRoleAnimation(role);
 }
 
+void MyAvatar::saveAvatarUrl() {
+    Settings settings;
+    settings.beginGroup("Avatar");
+    if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) {
+        settings.setValue("fullAvatarURL",
+                          _fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ?
+                          "" :
+                          _fullAvatarURLFromPreferences.toString());
+    }
+    settings.endGroup();
+}
+
 void MyAvatar::saveData() {
     Settings settings;
     settings.beginGroup("Avatar");
@@ -1452,6 +1464,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
     _headBoneSet.clear();
     _cauterizationNeedsUpdate = true;
+    saveAvatarUrl();
     emit skeletonChanged();
 
 }

interface/src/avatar/MyAvatar.h

@@ -646,6 +646,7 @@ private:
 
     void simulate(float deltaTime);
     void updateFromTrackers(float deltaTime);
+    void saveAvatarUrl();
     virtual void render(RenderArgs* renderArgs) override;
     virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
     void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); }

libraries/shared/src/BitVectorHelpers.h

@@ -12,6 +12,8 @@
 #ifndef hifi_BitVectorHelpers_h
 #define hifi_BitVectorHelpers_h
 
+#include "NumericalConstants.h"
+
 int calcBitVectorSize(int numBits) {
     return ((numBits - 1) >> 3) + 1;
 }

tests/shared/src/BitVectorHelperTests.cpp

@@ -20,8 +20,6 @@
 
 QTEST_MAIN(BitVectorHelperTests)
 
-const int BITS_IN_BYTE = 8;
-
 void BitVectorHelperTests::sizeTest() {
     std::vector<int> sizes = {0, 6, 7, 8, 30, 31, 32, 33, 87, 88, 89, 90, 90, 91, 92, 93};
     for (auto& size : sizes) {

tests/shared/src/FileCacheTests.cpp

@@ -33,7 +33,7 @@ size_t FileCacheTests::getCacheDirectorySize() const {
     return result;
 }
 
-FileCachePointer makeFileCache(QString& location) {
+FileCachePointer makeFileCache(QString location) {
     auto result = std::make_shared<FileCache>(location.toStdString(), "tmp");
     result->initialize();
     result->setMaxSize(MAX_UNUSED_SIZE);

tests/shared/src/GeometryUtilTests.cpp

@@ -31,20 +31,20 @@ static void testSphereVsCone(const glm::vec3 coneNormal, const glm::vec3 coneBiN
     glm::vec3 coneCenter = glm::vec3(0.0f, 0.0f, 0.0f);
     glm::vec3 sphereCenter = coneCenter + coneEdge * sphereDistance;
     float result = coneSphereAngle(coneCenter, u, sphereCenter, sphereRadius);
-    QCOMPARE(isnan(result), false);
+    QCOMPARE(glm::isnan(result), false);
     QCOMPARE(result < coneAngle, true);
 
     // push sphere outward from edge so it is tangent to the cone.
     glm::vec3 sphereOffset = glm::angleAxis(PI / 2.0f, w) * coneEdge;
     sphereCenter += sphereOffset * sphereRadius;
     result = coneSphereAngle(coneCenter, u, sphereCenter, sphereRadius);
-    QCOMPARE(isnan(result), false);
+    QCOMPARE(glm::isnan(result), false);
     QCOMPARE_WITH_ABS_ERROR(result, coneAngle, 0.001f);
 
     // push sphere outward from edge a bit further, so it is outside of the cone.
     sphereCenter += 0.1f * sphereOffset;
     result = coneSphereAngle(coneCenter, u, sphereCenter, sphereRadius);
-    QCOMPARE(isnan(result), false);
+    QCOMPARE(glm::isnan(result), false);
     QCOMPARE(result > coneAngle, true);
 }
 

tests/shared/src/PathUtilsTests.cpp

@@ -16,12 +16,8 @@
 QTEST_MAIN(PathUtilsTests)
 
 void PathUtilsTests::testPathUtils() {
-    QString result = PathUtils::qmlBasePath();
+    QString result = PathUtils::qmlBaseUrl();
-#if DEV_BUILD
-    QVERIFY(result.startsWith("file:///"));
-#else
     QVERIFY(result.startsWith("qrc:///"));
-#endif
     QVERIFY(result.endsWith("/"));
 }