Merge branch 'master' into check-pfx-file

INSTALL.md

@@ -21,6 +21,7 @@ To produce an executable installer on Windows, the following are required:
 - [NSISpcre Plug-in for Nullsoft](http://nsis.sourceforge.net/NSISpcre_plug-in) - 1.0
 - [nsisSlideshow Plug-in for Nullsoft](http://nsis.sourceforge.net/NsisSlideshow_plug-in) - 1.7
 - [Nsisunz plug-in for Nullsoft](http://nsis.sourceforge.net/Nsisunz_plug-in)
+- [ApplicationID plug-in for Nullsoft](http://nsis.sourceforge.net/ApplicationID_plug-in) - 1.0
 
 Run the `package` target to create an executable installer using the Nullsoft Scriptable Install System.
 

android/app/build.gradle

@@ -4,12 +4,15 @@ android {
     compileSdkVersion 26
     //buildToolsVersion '27.0.3'
 
+    def appVersionCode = Integer.valueOf(VERSION_CODE ?: 1)
+    def appVersionName = RELEASE_NUMBER ?: "1.0"
+
     defaultConfig {
         applicationId "io.highfidelity.hifiinterface"
         minSdkVersion 24
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        versionCode appVersionCode
+        versionName appVersionName
         ndk { abiFilters 'arm64-v8a' }
         externalNativeBuild {
             cmake {
@@ -24,7 +27,8 @@ android {
                     '-DRELEASE_TYPE=' + RELEASE_TYPE,
                     '-DSTABLE_BUILD=' + STABLE_BUILD,
                     '-DDISABLE_QML=OFF',
-                    '-DDISABLE_KTX_CACHE=OFF'
+                    '-DDISABLE_KTX_CACHE=OFF',
+                    '-DUSE_BREAKPAD=' + (System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_TOKEN") ? 'ON' : 'OFF');
             }
         }
         signingConfigs {
@@ -43,6 +47,10 @@ android {
     }
 
     buildTypes {
+        debug {
+            buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
+            buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -50,6 +58,8 @@ android {
                     project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") &&
                     project.hasProperty("HIFI_ANDROID_KEY_ALIAS") &&
                     project.hasProperty("HIFI_ANDROID_KEY_PASSWORD")? signingConfigs.release : null
+            buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
+            buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
         }
     }
 
@@ -64,6 +74,10 @@ android {
         // so our merge has to depend on the external native build
         variant.externalNativeBuildTasks.each { task ->
             variant.mergeResources.dependsOn(task)
+            def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
+            def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first()
+            runDumpSymsTask.dependsOn(task)
+            variant.assemble.dependsOn(uploadDumpSymsTask)
         }
 
         variant.mergeAssets.doLast {

android/app/src/main/AndroidManifest.xml

@@ -67,6 +67,12 @@
             android:name=".SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Translucent.NoActionBar" />
+
+        <service
+            android:name=".BreakpadUploaderService"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":breakpad_uploader"/>
     </application>
 
     <uses-feature android:name="android.software.vr.mode" android:required="true"/>

android/app/src/main/cpp/native.cpp

@@ -228,7 +228,7 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_nativeLogin(JNIEnv *en
     env->ReleaseStringUTFChars(username_, c_username);
     env->ReleaseStringUTFChars(password_, c_password);
 
-    auto accountManager = AndroidHelper::instance().getAccountManager();
+    auto accountManager = DependencyManager::get<AccountManager>();
 
     __loginCompletedListener = QAndroidJniObject(instance);
     __usernameChangedListener = QAndroidJniObject(usernameChangedListener);
@@ -270,18 +270,18 @@ Java_io_highfidelity_hifiinterface_SplashActivity_registerLoadCompleteListener(J
 }
 JNIEXPORT jboolean JNICALL
 Java_io_highfidelity_hifiinterface_MainActivity_nativeIsLoggedIn(JNIEnv *env, jobject instance) {
-    return AndroidHelper::instance().getAccountManager()->isLoggedIn();
+    return DependencyManager::get<AccountManager>()->isLoggedIn();
 }
 
 JNIEXPORT void JNICALL
 Java_io_highfidelity_hifiinterface_MainActivity_nativeLogout(JNIEnv *env, jobject instance) {
-    AndroidHelper::instance().getAccountManager()->logout();
+    DependencyManager::get<AccountManager>()->logout();
 }
 
 JNIEXPORT jstring JNICALL
 Java_io_highfidelity_hifiinterface_MainActivity_nativeGetDisplayName(JNIEnv *env,
                                                                      jobject instance) {
-    QString username = AndroidHelper::instance().getAccountManager()->getAccountInfo().getUsername();
+    QString username = DependencyManager::get<AccountManager>()->getAccountInfo().getUsername();
     return env->NewStringUTF(username.toLatin1().data());
 }
 

android/app/src/main/java/io/highfidelity/hifiinterface/BreakpadUploaderService.java

@@ -0,0 +1,173 @@
+package io.highfidelity.hifiinterface;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.FileObserver;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.net.ssl.HttpsURLConnection;
+
+public class BreakpadUploaderService extends Service {
+
+    private static final String ANNOTATIONS_JSON = "annotations.json";
+    private static final String TAG = "Interface";
+    public static final String EXT_DMP = "dmp";
+    private static final long DUMP_DELAY = 5000;
+
+    private FileObserver fileObserver;
+
+    public BreakpadUploaderService() {
+        super();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        URL baseUrl;
+
+        baseUrl = getUrl();
+
+        if (baseUrl == null) {
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+
+        new Thread(() -> {
+            File[] matchingFiles = getFilesByExtension(getObbDir(), EXT_DMP);
+            for (File file : matchingFiles) {
+                uploadDumpAndDelete(file, baseUrl);
+            }
+        }).start();
+
+        fileObserver = new FileObserver(getObbDir().getPath()) {
+            @Override
+            public void onEvent(int event, String path) {
+                if (path == null) {
+                    return;
+                }
+                if (FileObserver.CREATE == event && EXT_DMP.equals(getExtension(path))) {
+                    URL baseUrl = getUrl();
+                    if (baseUrl != null) {
+                        new Timer().schedule(new TimerTask() {
+                            @Override
+                            public void run() {
+                                uploadDumpAndDelete(new File(getObbDir(), path), baseUrl);
+                            }
+                        }, DUMP_DELAY);
+                    }
+                }
+            }
+        };
+
+        fileObserver.startWatching();
+        return START_STICKY;
+    }
+
+    private URL getUrl() {
+        String parameters = getAnnotationsAsUrlEncodedParameters();
+        try {
+            return new URL(BuildConfig.BACKTRACE_URL+ "/post?format=minidump&token=" + BuildConfig.BACKTRACE_TOKEN + (parameters.isEmpty() ? "" : ("&" + parameters)));
+        } catch (MalformedURLException e) {
+            Log.e(TAG, "Could not initialize Breakpad URL", e);
+        }
+        return null;
+    }
+
+    private void uploadDumpAndDelete(File file, URL url) {
+        int size = (int) file.length();
+        byte[] bytes = new byte[size];
+        try {
+            BufferedInputStream buf = new BufferedInputStream(new FileInputStream(file));
+                buf.read(bytes, 0, bytes.length);
+            buf.close();
+            HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection();
+            urlConnection.setRequestMethod("POST");
+            urlConnection.setDoOutput(true);
+            urlConnection.setChunkedStreamingMode(0);
+
+            OutputStream ostream = urlConnection.getOutputStream();
+
+            OutputStream out = new BufferedOutputStream(ostream);
+            out.write(bytes, 0, size);
+
+            InputStream in = new BufferedInputStream(urlConnection.getInputStream());
+            in.read();
+            if (urlConnection.getResponseCode() == 200) {
+                file.delete();
+            }
+            urlConnection.disconnect();
+        } catch (IOException e) {
+            Log.e(TAG, "Error uploading file " + file.getAbsolutePath(), e);
+        }
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    private File[] getFilesByExtension(File dir, final String extension) {
+        return dir.listFiles(pathName -> getExtension(pathName.getName()).equals(extension));
+    }
+
+    private String getExtension(String fileName) {
+        String extension = "";
+
+        int i = fileName.lastIndexOf('.');
+        int p = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\'));
+
+        if (i > p) {
+            extension = fileName.substring(i+1);
+        }
+
+        return extension;
+    }
+
+
+    public String getAnnotationsAsUrlEncodedParameters() {
+        String parameters = "";
+        File annotationsFile = new File(getObbDir(), ANNOTATIONS_JSON);
+        if (annotationsFile.exists()) {
+            JsonParser parser = new JsonParser();
+            try {
+                JsonObject json = (JsonObject) parser.parse(new FileReader(annotationsFile));
+                for (String k: json.keySet()) {
+                    if (!json.get(k).getAsString().isEmpty()) {
+                        String key = k.contains("/") ? k.substring(k.indexOf("/") + 1) : k;
+                        if (!parameters.isEmpty()) {
+                            parameters += "&";
+                        }
+                        parameters += URLEncoder.encode(key, "UTF-8") + "=" + URLEncoder.encode(json.get(k).getAsString(), "UTF-8");
+                    }
+                }
+            } catch (FileNotFoundException e) {
+                Log.e(TAG, "Error reading annotations file", e);
+            } catch (UnsupportedEncodingException e) {
+                Log.e(TAG, "Error reading annotations file", e);
+            }
+        }
+        return parameters;
+    }
+
+}

android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java

@@ -56,6 +56,8 @@ public class InterfaceActivity extends QtActivity {
     private AssetManager assetManager;
 
     private static boolean inVrMode;
+
+    private boolean nativeEnterBackgroundCallEnqueued = false;
 //    private GvrApi gvrApi;
     // Opaque native pointer to the Application C++ object.
     // This object is owned by the InterfaceActivity instance and passed to the native methods.
@@ -121,13 +123,18 @@ public class InterfaceActivity extends QtActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        nativeEnterBackground();
+        if (super.isLoading) {
+            nativeEnterBackgroundCallEnqueued = true;
+        } else {
+            nativeEnterBackground();
+        }
         //gvrApi.pauseTracking();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
+        nativeEnterBackgroundCallEnqueued = false;
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
     }
 
@@ -256,6 +263,9 @@ public class InterfaceActivity extends QtActivity {
 
     public void onAppLoadedComplete() {
         super.isLoading = false;
+        if (nativeEnterBackgroundCallEnqueued) {
+            nativeEnterBackground();
+        }
     }
 
     public void performHapticFeedback(int duration) {

android/app/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java

@@ -1,13 +1,13 @@
 package io.highfidelity.hifiinterface;
 
 import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.app.Activity;
-
-import android.content.DialogInterface;
-import android.app.AlertDialog;
+import android.util.Log;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -24,20 +24,31 @@ public class PermissionChecker extends Activity {
     private static final int REQUEST_PERMISSIONS = 20;
 
     private static final boolean CHOOSE_AVATAR_ON_STARTUP = false;
+    private static final String TAG = "Interface";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Intent myIntent = new Intent(this, BreakpadUploaderService.class);
+        startService(myIntent);
         if (CHOOSE_AVATAR_ON_STARTUP) {
             showMenu();
         }
-        this.requestAppPermissions(new
-                String[]{
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.RECORD_AUDIO,
-                Manifest.permission.CAMERA}
-            ,2,REQUEST_PERMISSIONS);
+
+        File obbDir = getObbDir();
+        if (!obbDir.exists()) {
+            if (obbDir.mkdirs()) {
+                Log.d(TAG, "Obb dir created");
+            }
+        }
+
+        requestAppPermissions(new
+                        String[]{
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.RECORD_AUDIO,
+                        Manifest.permission.CAMERA}
+                ,2,REQUEST_PERMISSIONS);
 
     }
 
@@ -124,6 +135,4 @@ public class PermissionChecker extends Activity {
             launchActivityWithPermissions();
         }
     }
-
-
 }

android/build.gradle

@@ -21,6 +21,7 @@ buildscript {
 plugins {
     id 'de.undercouch.download' version '3.3.0'
     id "cz.malohlava" version "1.0.3"
+    id "io.github.http-builder-ng.http-plugin" version "0.1.1"
 }
 
 allprojects {
@@ -36,6 +37,7 @@ task clean(type: Delete) {
 
 ext {
     RELEASE_NUMBER = project.hasProperty('RELEASE_NUMBER') ? project.getProperty('RELEASE_NUMBER') : '0'
+    VERSION_CODE = project.hasProperty('VERSION_CODE') ? project.getProperty('VERSION_CODE') : '0'
     RELEASE_TYPE = project.hasProperty('RELEASE_TYPE') ? project.getProperty('RELEASE_TYPE') : 'DEV'
     STABLE_BUILD = project.hasProperty('STABLE_BUILD') ? project.getProperty('STABLE_BUILD') : '0'
     EXEC_SUFFIX = Os.isFamily(Os.FAMILY_WINDOWS) ? '.exe' : ''
@@ -67,6 +69,7 @@ def baseFolder = new File(HIFI_ANDROID_PRECOMPILED)
 def appDir = new File(projectDir, 'app')
 def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
 def baseUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/android/'
+def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms")
 
 def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz'
 def qtChecksum='04599670ccca84bd2b15f6915568eb2d'
@@ -149,6 +152,13 @@ def packages = [
         file: 'etc2comp-patched-armv8-libcpp.tgz',
         versionId: 'bHhGECRAQR1vkpshBcK6ByNc1BQIM8gU',
         checksum: '14b02795d774457a33bbc60e00a786bc'
+    ],
+    breakpad: [
+        file: 'breakpad.tgz',
+        versionId: '8VrYXz7oyc.QBxNia0BVJOUBvrFO61jI',
+        checksum: 'ddcb23df336b08017042ba4786db1d9e',
+        sharedLibFolder: 'lib',
+        includeLibs: ['libbreakpad_client.a']
     ]
 ]
 
@@ -367,6 +377,7 @@ task verifyPolyvox(type: Verify) { def p = packages['polyvox']; src new File(bas
 task verifyTBB(type: Verify) { def p = packages['tbb']; src new File(baseFolder, p['file']); checksum p['checksum'] }
 task verifyHifiAC(type: Verify) { def p = packages['hifiAC']; src new File(baseFolder, p['file']); checksum p['checksum'] }
 task verifyEtc2Comp(type: Verify) { def p = packages['etc2comp']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+task verifyBreakpad(type: Verify) { def p = packages['breakpad']; src new File(baseFolder, p['file']); checksum p['checksum'] }
 
 task verifyDependencyDownloads(dependsOn: downloadDependencies) { }
 verifyDependencyDownloads.dependsOn verifyQt
@@ -378,6 +389,7 @@ verifyDependencyDownloads.dependsOn verifyPolyvox
 verifyDependencyDownloads.dependsOn verifyTBB
 verifyDependencyDownloads.dependsOn verifyHifiAC
 verifyDependencyDownloads.dependsOn verifyEtc2Comp
+verifyDependencyDownloads.dependsOn verifyBreakpad
 
 task extractDependencies(dependsOn: verifyDependencyDownloads) {
     doLast {
@@ -540,7 +552,93 @@ task cleanDependencies(type: Delete) {
     delete 'app/src/main/res/values/libs.xml'
 }
 
+def runBreakpadDumpSyms = { buildType ->
+    gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS
 
+    def objDir = new File("${appDir}/build/intermediates/cmake/${buildType}/obj/arm64-v8a")
+    def stripDebugSymbol = "${appDir}/build/intermediates/transforms/stripDebugSymbol/${buildType}/0/lib/arm64-v8a/"
+    def outputDir = new File(breakpadDumpSymsDir, buildType)
+    if (!outputDir.exists()) {
+        outputDir.mkdirs()
+    }
+
+    objDir.eachFileRecurse (FileType.FILES) { file ->
+        if (file.name.endsWith('.so')) {
+            def output = file.name + ".sym"
+            def cmdArgs = [
+                    file.toString(),
+                    stripDebugSymbol
+            ]
+            def result = exec {
+                workingDir HIFI_ANDROID_PRECOMPILED + '/breakpad/bin'
+                commandLine './dump_syms'
+                args cmdArgs
+                ignoreExitValue true
+                standardOutput = new BufferedOutputStream(new FileOutputStream(new File(outputDir, output)))
+            }
+        }
+    }
+}
+
+task runBreakpadDumpSymsDebug() {
+    doLast {
+        runBreakpadDumpSyms("debug");
+    }
+}
+
+task runBreakpadDumpSymsRelease() {
+    doLast {
+        runBreakpadDumpSyms("release");
+    }
+}
+
+task zipDumpSymsDebug(type: Zip, dependsOn: runBreakpadDumpSymsDebug) {
+    from (new File(breakpadDumpSymsDir, "debug").absolutePath)
+    archiveName "symbols-${RELEASE_NUMBER}-debug.zip"
+    destinationDir(new File("${appDir}/build/tmp/"))
+}
+
+task zipDumpSymsRelease(type: Zip, dependsOn: runBreakpadDumpSymsRelease) {
+    from (new File(breakpadDumpSymsDir, "release").absolutePath)
+    archiveName "symbols-${RELEASE_NUMBER}-release.zip"
+    destinationDir(new File("${appDir}/build/tmp/"))
+}
+
+task uploadBreakpadDumpSymsDebug(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsDebug) {
+    onlyIf {
+        System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
+    }
+    config {
+        request.uri = System.getenv("CMAKE_BACKTRACE_URL")
+    }
+    post {
+        request.uri.path = '/post'
+        request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
+        request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-debug.zip").bytes
+        request.contentType = 'application/octet-stream'
+        response.success {
+            println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-debug.zip uploaded")
+        }
+    }
+}
+
+task uploadBreakpadDumpSymsRelease(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsRelease) {
+    onlyIf {
+        System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
+    }
+    config {
+        request.uri = System.getenv("CMAKE_BACKTRACE_URL")
+    }
+    post {
+        request.uri.path = '/post'
+        request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
+        request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-release.zip").bytes
+        request.contentType = 'application/octet-stream'
+        response.success {
+            println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-release.zip uploaded")
+        }
+    }
+}
 
 // FIXME this code is prototyping the desired functionality for doing build time binary dependency resolution.
 // See the comment on the qtBundle task above
@@ -615,4 +713,4 @@ task testElf (dependsOn: 'externalNativeBuildDebug') {
         }
     }
 }
-*/
+*/

assignment-client/src/Agent.cpp

@@ -64,6 +64,7 @@ Agent::Agent(ReceivedMessage& message) :
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
     DependencyManager::set<ResourceManager>();
+    DependencyManager::set<PluginManager>();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -833,6 +834,8 @@ void Agent::aboutToFinish() {
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
+    DependencyManager::destroy<PluginManager>();
+
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();
 

assignment-client/src/assets/AssetServer.cpp

@@ -291,18 +291,6 @@ AssetServer::AssetServer(ReceivedMessage& message) :
     _bakingTaskPool(this),
     _filesizeLimit(AssetUtils::MAX_UPLOAD_SIZE)
 {
-    // store the current state of image compression so we can reset it when this assignment is complete
-    _wasColorTextureCompressionEnabled = image::isColorTexturesCompressionEnabled();
-    _wasGrayscaleTextureCompressionEnabled = image::isGrayscaleTexturesCompressionEnabled();
-    _wasNormalTextureCompressionEnabled = image::isNormalTexturesCompressionEnabled();
-    _wasCubeTextureCompressionEnabled = image::isCubeTexturesCompressionEnabled();
-
-    // enable compression in image library
-    image::setColorTexturesCompressionEnabled(true);
-    image::setGrayscaleTexturesCompressionEnabled(true);
-    image::setNormalTexturesCompressionEnabled(true);
-    image::setCubeTexturesCompressionEnabled(true);
-
     BAKEABLE_TEXTURE_EXTENSIONS = image::getSupportedFormats();
     qDebug() << "Supported baking texture formats:" << BAKEABLE_MODEL_EXTENSIONS;
 
@@ -354,12 +342,6 @@ void AssetServer::aboutToFinish() {
     while (_pendingBakes.size() > 0) {
         QCoreApplication::processEvents();
     }
-
-    // re-set defaults in image library
-    image::setColorTexturesCompressionEnabled(_wasCubeTextureCompressionEnabled);
-    image::setGrayscaleTexturesCompressionEnabled(_wasGrayscaleTextureCompressionEnabled);
-    image::setNormalTexturesCompressionEnabled(_wasNormalTextureCompressionEnabled);
-    image::setCubeTexturesCompressionEnabled(_wasCubeTextureCompressionEnabled);
 }
 
 void AssetServer::run() {

assignment-client/src/assets/AssetServer.h

@@ -167,11 +167,6 @@ private:
     using RequestQueue = QVector<QPair<QSharedPointer<ReceivedMessage>, SharedNodePointer>>;
     RequestQueue _queuedRequests;
 
-    bool _wasColorTextureCompressionEnabled { false };
-    bool _wasGrayscaleTextureCompressionEnabled { false  };
-    bool _wasNormalTextureCompressionEnabled { false };
-    bool _wasCubeTextureCompressionEnabled { false };
-
     uint64_t _filesizeLimit;
 };
 

assignment-client/src/audio/AudioMixer.cpp

@@ -65,7 +65,8 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
 
     // hash the available codecs (on the mixer)
     _availableCodecs.clear(); // Make sure struct is clean
-    auto codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    auto pluginManager = DependencyManager::set<PluginManager>();
+    auto codecPlugins = pluginManager->getCodecPlugins();
     std::for_each(codecPlugins.cbegin(), codecPlugins.cend(),
         [&](const CodecPluginPointer& codec) {
             _availableCodecs[codec->getName()] = codec;
@@ -106,6 +107,10 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
     connect(nodeList.data(), &NodeList::nodeKilled, this, &AudioMixer::handleNodeKilled);
 }
 
+void AudioMixer::aboutToFinish() {
+    DependencyManager::destroy<PluginManager>();
+}
+
 void AudioMixer::queueAudioPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {
     if (message->getType() == PacketType::SilentAudioFrame) {
         _numSilentPackets++;

assignment-client/src/audio/AudioMixer.h

@@ -58,6 +58,9 @@ public:
                to.getPublicSocket() != from.getPublicSocket() &&
                to.getLocalSocket() != from.getLocalSocket();
     }
+
+    virtual void aboutToFinish() override;
+    
 public slots:
     void run() override;
     void sendStatsPacket() override;

assignment-client/src/avatars/AvatarMixerSlave.cpp

@@ -396,21 +396,26 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
         quint64 end = usecTimestampNow();
         _stats.toByteArrayElapsedTime += (end - start);
 
-        static const int MAX_ALLOWED_AVATAR_DATA = (1400 - NUM_BYTES_RFC4122_UUID);
-        if (bytes.size() > MAX_ALLOWED_AVATAR_DATA) {
-            qCWarning(avatars) << "otherAvatar.toByteArray() resulted in very large buffer:" << bytes.size() << "... attempt to drop facial data";
+        auto maxAvatarDataBytes = avatarPacketList->getMaxSegmentSize() - NUM_BYTES_RFC4122_UUID;
+        if (bytes.size() > maxAvatarDataBytes) {
+            qCWarning(avatars) << "otherAvatar.toByteArray() for" << otherNode->getUUID()
+                << "resulted in very large buffer of" << bytes.size() << "bytes - dropping facial data";
 
             dropFaceTracking = true; // first try dropping the facial data
             bytes = otherAvatar->toByteArray(detail, lastEncodeForOther, lastSentJointsForOther,
                                              hasFlagsOut, dropFaceTracking, distanceAdjust, viewerPosition, &lastSentJointsForOther);
 
-            if (bytes.size() > MAX_ALLOWED_AVATAR_DATA) {
-                qCWarning(avatars) << "otherAvatar.toByteArray() without facial data resulted in very large buffer:" << bytes.size() << "... reduce to MinimumData";
+            if (bytes.size() > maxAvatarDataBytes) {
+                qCWarning(avatars) << "otherAvatar.toByteArray() for" << otherNode->getUUID()
+                    << "without facial data resulted in very large buffer of" << bytes.size()
+                    << "bytes - reducing to MinimumData";
                 bytes = otherAvatar->toByteArray(AvatarData::MinimumData, lastEncodeForOther, lastSentJointsForOther,
                                                  hasFlagsOut, dropFaceTracking, distanceAdjust, viewerPosition, &lastSentJointsForOther);
 
-                if (bytes.size() > MAX_ALLOWED_AVATAR_DATA) {
-                    qCWarning(avatars) << "otherAvatar.toByteArray() MinimumData resulted in very large buffer:" << bytes.size() << "... FAIL!!";
+                if (bytes.size() > maxAvatarDataBytes) {
+                    qCWarning(avatars) << "otherAvatar.toByteArray() for" << otherNode->getUUID()
+                        << "MinimumData resulted in very large buffer of" << bytes.size()
+                        << "bytes - refusing to send avatar";
                     includeThisAvatar = false;
                 }
             }

assignment-client/src/entities/EntityServer.cpp

@@ -504,6 +504,11 @@ void EntityServer::startDynamicDomainVerification() {
                         QString thisDomainID = DependencyManager::get<AddressManager>()->getDomainID().remove(QRegExp("\\{|\\}"));
                         if (jsonObject["domain_id"].toString() != thisDomainID) {
                             EntityItemPointer entity = tree->findEntityByEntityItemID(entityID);
+                            if (!entity) {
+                                qCDebug(entities) << "Entity undergoing dynamic domain verification is no longer available:" << entityID;
+                                networkReply->deleteLater();
+                                return;
+                            }
                             if (entity->getAge() > (_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS/MSECS_PER_SECOND)) {
                                 qCDebug(entities) << "Entity's cert's domain ID" << jsonObject["domain_id"].toString()
                                                 << "doesn't match the current Domain ID" << thisDomainID << "; deleting entity" << entityID;

assignment-client/src/octree/OctreeServer.cpp

@@ -231,18 +231,19 @@ void OctreeServer::trackProcessWaitTime(float time) {
 OctreeServer::OctreeServer(ReceivedMessage& message) :
     ThreadedAssignment(message),
     _argc(0),
-    _argv(NULL),
-    _parsedArgV(NULL),
+    _argv(nullptr),
+    _parsedArgV(nullptr),
+    _httpManager(nullptr),
     _statusPort(0),
     _packetsPerClientPerInterval(10),
     _packetsTotalPerInterval(DEFAULT_PACKETS_PER_INTERVAL),
-    _tree(NULL),
+    _tree(nullptr),
     _wantPersist(true),
     _debugSending(false),
     _debugReceiving(false),
     _verboseDebug(false),
-    _octreeInboundPacketProcessor(NULL),
-    _persistThread(NULL),
+    _octreeInboundPacketProcessor(nullptr),
+    _persistManager(nullptr),
     _started(time(0)),
     _startedUSecs(usecTimestampNow())
 {
@@ -265,11 +266,8 @@ OctreeServer::~OctreeServer() {
         _octreeInboundPacketProcessor->deleteLater();
     }
 
-    if (_persistThread) {
-        _persistThread->terminating();
-        _persistThread->terminate();
-        _persistThread->deleteLater();
-    }
+    qDebug() << "Waiting for persist thread to come down";
+    _persistThread.wait();
 
     // cleanup our tree here...
     qDebug() << qPrintable(_safeServerName) << "server START cleaning up octree... [" << this << "]";
@@ -1052,19 +1050,13 @@ void OctreeServer::readConfiguration() {
         _persistAsFileType = "json.gz";
 
         _persistInterval = OctreePersistThread::DEFAULT_PERSIST_INTERVAL;
-        readOptionInt(QString("persistInterval"), settingsSectionObject, _persistInterval);
-        qDebug() << "persistInterval=" << _persistInterval;
-
-        bool noBackup;
-        readOptionBool(QString("NoBackup"), settingsSectionObject, noBackup);
-        _wantBackup = !noBackup;
-        qDebug() << "wantBackup=" << _wantBackup;
-
-        if (!readOptionString("backupDirectoryPath", settingsSectionObject, _backupDirectoryPath)) {
-            _backupDirectoryPath = "";
+        int result { -1 };
+        readOptionInt(QString("persistInterval"), settingsSectionObject, result);
+        if (result != -1) {
+            _persistInterval = std::chrono::milliseconds(result);
         }
 
-        qDebug() << "backupDirectoryPath=" << _backupDirectoryPath;
+        qDebug() << "persistInterval=" << _persistInterval.count();
 
         readOptionBool(QString("persistFileDownload"), settingsSectionObject, _persistFileDownload);
         qDebug() << "persistFileDownload=" << _persistFileDownload;
@@ -1128,111 +1120,14 @@ void OctreeServer::run() {
 }
 
 void OctreeServer::domainSettingsRequestComplete() {
-    if (_state != OctreeServerState::WaitingForDomainSettings) {
-        qCWarning(octree_server) << "Received domain settings after they have already been received";
-        return;
-    }
-
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(getMyQueryMessageType(), this, "handleOctreeQueryPacket");
     packetReceiver.registerListener(PacketType::OctreeDataNack, this, "handleOctreeDataNackPacket");
-
-    packetReceiver.registerListener(PacketType::OctreeDataFileReply, this, "handleOctreeDataFileReply");
+    packetReceiver.registerListener(getMyQueryMessageType(), this, "handleOctreeQueryPacket");
 
     qDebug(octree_server) << "Received domain settings";
 
     readConfiguration();
 
-    _state = OctreeServerState::WaitingForOctreeDataNegotation;
-
-    auto nodeList = DependencyManager::get<NodeList>();
-    const DomainHandler& domainHandler = nodeList->getDomainHandler();
-
-    auto packet = NLPacket::create(PacketType::OctreeDataFileRequest, -1, true, false);
-
-    OctreeUtils::RawOctreeData data;
-    qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
-    if (data.readOctreeDataInfoFromFile(_persistAbsoluteFilePath)) {
-        qCDebug(octree_server) << "Current octree data: ID(" << data.id << ") DataVersion(" << data.version << ")";
-        packet->writePrimitive(true);
-        auto id = data.id.toRfc4122();
-        packet->write(id);
-        packet->writePrimitive(data.version);
-    } else {
-        qCWarning(octree_server) << "No octree data found";
-        packet->writePrimitive(false);
-    }
-
-    qCDebug(octree_server) << "Sending request for octree data to DS";
-    nodeList->sendPacket(std::move(packet), domainHandler.getSockAddr());
-} 
-
-void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> message) {
-    if (_state != OctreeServerState::WaitingForOctreeDataNegotation) {
-        qCWarning(octree_server) << "Server received ocree data file reply but is not currently negotiating.";
-        return;
-    }
-
-    bool includesNewData;
-    message->readPrimitive(&includesNewData);
-    QByteArray replaceData;
-    if (includesNewData) {
-        replaceData = message->readAll();
-        qDebug() << "Got reply to octree data file request, new data sent";
-    } else {
-        qDebug() << "Got reply to octree data file request, current entity data is sufficient";
-        
-        OctreeUtils::RawEntityData data;
-        qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
-        if (data.readOctreeDataInfoFromFile(_persistAbsoluteFilePath)) {
-            if (data.id.isNull()) {
-                qCDebug(octree_server) << "Current octree data has a null id, updating";
-                data.resetIdAndVersion();
-
-                QFile file(_persistAbsoluteFilePath);
-                if (file.open(QIODevice::WriteOnly)) {
-                    auto entityData = data.toGzippedByteArray();
-                    file.write(entityData);
-                    file.close();
-                } else {
-                    qCDebug(octree_server) << "Failed to update octree data";
-                }
-            }
-        }
-    }
-
-    _state = OctreeServerState::Running;
-    beginRunning(replaceData);
-}
-
-void OctreeServer::beginRunning(QByteArray replaceData) {
-    if (_state != OctreeServerState::Running) {
-        qCWarning(octree_server) << "Server is not running";
-        return;
-    }
-
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    // we need to ask the DS about agents so we can ping/reply with them
-    nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
-
-    beforeRun(); // after payload has been processed
-
-    connect(nodeList.data(), SIGNAL(nodeAdded(SharedNodePointer)), SLOT(nodeAdded(SharedNodePointer)));
-    connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
-
-#ifndef WIN32
-    setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
-
-    nodeList->linkedDataCreateCallback = [this](Node* node) {
-        auto queryNodeData = createOctreeQueryNode();
-        queryNodeData->init();
-        node->setLinkedData(std::move(queryNodeData));
-    };
-
-    srand((unsigned)time(0));
-
     // if we want Persistence, set up the local file and persist thread
     if (_wantPersist) {
         static const QString ENTITY_PERSIST_EXTENSION = ".json.gz";
@@ -1288,40 +1183,40 @@ void OctreeServer::beginRunning(QByteArray replaceData) {
         }
 
         auto persistFileDirectory = QFileInfo(_persistAbsoluteFilePath).absolutePath();
-        if (_backupDirectoryPath.isEmpty()) {
-            // Use the persist file's directory to store backups
-            _backupDirectoryPath = persistFileDirectory;
-        } else {
-            // The backup directory has been set.
-            //   If relative, make it relative to the entities directory in the application data directory
-            //   If absolute, no resolution is necessary
-            QDir backupDirectory { _backupDirectoryPath };
-            QString absoluteBackupDirectory;
-            if (backupDirectory.isRelative()) {
-                absoluteBackupDirectory = QDir(PathUtils::getAppDataFilePath("entities/")).absoluteFilePath(_backupDirectoryPath);
-                absoluteBackupDirectory = QDir(absoluteBackupDirectory).absolutePath();
-            } else {
-                absoluteBackupDirectory = backupDirectory.absolutePath();
-            }
-            backupDirectory = QDir(absoluteBackupDirectory);
-            if (!backupDirectory.exists()) {
-                if (backupDirectory.mkpath(".")) {
-                    qDebug() << "Created backup directory";
-                } else {
-                    qDebug() << "ERROR creating backup directory, using persist file directory";
-                    _backupDirectoryPath = persistFileDirectory;
-                }
-            } else {
-                _backupDirectoryPath = absoluteBackupDirectory;
-            }
-        }
-        qDebug() << "Backups will be stored in: " << _backupDirectoryPath;
 
         // now set up PersistThread
-        _persistThread = new OctreePersistThread(_tree, _persistAbsoluteFilePath, _backupDirectoryPath, _persistInterval,
-                                                 _wantBackup, _settings, _debugTimestampNow, _persistAsFileType, replaceData);
-        _persistThread->initialize(true);
+        _persistManager = new OctreePersistThread(_tree, _persistAbsoluteFilePath, _persistInterval, _debugTimestampNow,
+                                                 _persistAsFileType);
+        _persistManager->moveToThread(&_persistThread);
+        connect(&_persistThread, &QThread::finished, _persistManager, &QObject::deleteLater);
+        connect(&_persistThread, &QThread::started, _persistManager, &OctreePersistThread::start);
+        connect(_persistManager, &OctreePersistThread::loadCompleted, this, [this]() {
+            beginRunning();
+        });
+        _persistThread.start();
+    } else {
+        beginRunning();
     }
+} 
+
+void OctreeServer::beginRunning() {
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    // we need to ask the DS about agents so we can ping/reply with them
+    nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
+
+    beforeRun(); // after payload has been processed
+
+    connect(nodeList.data(), &NodeList::nodeAdded, this, &OctreeServer::nodeAdded);
+    connect(nodeList.data(), &NodeList::nodeKilled, this, &OctreeServer::nodeKilled);
+
+    nodeList->linkedDataCreateCallback = [this](Node* node) {
+        auto queryNodeData = createOctreeQueryNode();
+        queryNodeData->init();
+        node->setLinkedData(std::move(queryNodeData));
+    };
+
+    srand((unsigned)time(0));
 
     // set up our OctreeServerPacketProcessor
     _octreeInboundPacketProcessor = new OctreeInboundPacketProcessor(this);
@@ -1384,7 +1279,7 @@ void OctreeServer::aboutToFinish() {
 
     qDebug() << qPrintable(_safeServerName) << "inform Octree Inbound Packet Processor that we are shutting down...";
 
-    // we're going down - set the NodeList linkedDataCallback to NULL so we do not create any more OctreeQueryNode objects.
+    // we're going down - set the NodeList linkedDataCallback to nullptr so we do not create any more OctreeQueryNode objects.
     // This ensures that we don't get any more newly connecting nodes
     DependencyManager::get<NodeList>()->linkedDataCreateCallback = nullptr;
 
@@ -1402,9 +1297,8 @@ void OctreeServer::aboutToFinish() {
     // which waits on the thread to be done before returning
     _sendThreads.clear(); // Cleans up all the send threads.
 
-    if (_persistThread) {
-        _persistThread->aboutToFinish();
-        _persistThread->terminating();
+    if (_persistManager) {
+        _persistThread.quit();
     }
 
     qDebug() << qPrintable(_safeServerName) << "server ENDING about to finish...";

assignment-client/src/octree/OctreeServer.h

@@ -33,12 +33,6 @@ Q_DECLARE_LOGGING_CATEGORY(octree_server)
 
 const int DEFAULT_PACKETS_PER_INTERVAL = 2000; // some 120,000 packets per second total
 
-enum class OctreeServerState {
-    WaitingForDomainSettings,
-    WaitingForOctreeDataNegotation,
-    Running
-};
-
 /// Handles assignments of type OctreeServer - sending octrees to various clients.
 class OctreeServer : public ThreadedAssignment, public HTTPRequestHandler {
     Q_OBJECT
@@ -46,8 +40,6 @@ public:
     OctreeServer(ReceivedMessage& message);
     ~OctreeServer();
 
-    OctreeServerState _state { OctreeServerState::WaitingForDomainSettings };
-
     /// allows setting of run arguments
     void setArguments(int argc, char** argv);
 
@@ -68,12 +60,12 @@ public:
     static void clientConnected() { _clientCount++; }
     static void clientDisconnected() { _clientCount--; }
 
-    bool isInitialLoadComplete() const { return (_persistThread) ? _persistThread->isInitialLoadComplete() : true; }
-    bool isPersistEnabled() const { return (_persistThread) ? true : false; }
-    quint64 getLoadElapsedTime() const { return (_persistThread) ? _persistThread->getLoadElapsedTime() : 0; }
-    QString getPersistFilename() const { return (_persistThread) ? _persistThread->getPersistFilename() : ""; }
-    QString getPersistFileMimeType() const { return (_persistThread) ? _persistThread->getPersistFileMimeType() : "text/plain"; }
-    QByteArray getPersistFileContents() const { return (_persistThread) ? _persistThread->getPersistFileContents() : QByteArray(); }
+    bool isInitialLoadComplete() const { return (_persistManager) ? _persistManager->isInitialLoadComplete() : true; }
+    bool isPersistEnabled() const { return (_persistManager) ? true : false; }
+    quint64 getLoadElapsedTime() const { return (_persistManager) ? _persistManager->getLoadElapsedTime() : 0; }
+    QString getPersistFilename() const { return (_persistManager) ? _persistManager->getPersistFilename() : ""; }
+    QString getPersistFileMimeType() const { return (_persistManager) ? _persistManager->getPersistFileMimeType() : "text/plain"; }
+    QByteArray getPersistFileContents() const { return (_persistManager) ? _persistManager->getPersistFileContents() : QByteArray(); }
 
     // Subclasses must implement these methods
     virtual std::unique_ptr<OctreeQueryNode> createOctreeQueryNode() = 0;
@@ -149,7 +141,6 @@ private slots:
     void domainSettingsRequestComplete();
     void handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleOctreeDataNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
-    void handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> message);
     void removeSendThread();
 
 protected:
@@ -171,7 +162,7 @@ protected:
     QString getConfiguration();
     QString getStatusLink();
 
-    void beginRunning(QByteArray replaceData);
+    void beginRunning();
     
     UniqueSendThread createSendThread(const SharedNodePointer& node);
     virtual UniqueSendThread newSendThread(const SharedNodePointer& node) = 0;
@@ -190,7 +181,6 @@ protected:
     QString _persistFilePath;
     QString _persistAbsoluteFilePath;
     QString _persistAsFileType;
-    QString _backupDirectoryPath;
     int _packetsPerClientPerInterval;
     int _packetsTotalPerInterval;
     OctreePointer _tree; // this IS a reaveraging tree
@@ -200,13 +190,11 @@ protected:
     bool _debugTimestampNow;
     bool _verboseDebug;
     OctreeInboundPacketProcessor* _octreeInboundPacketProcessor;
-    OctreePersistThread* _persistThread;
+    OctreePersistThread* _persistManager;
+    QThread _persistThread;
 
-    int _persistInterval;
-    bool _wantBackup;
+    std::chrono::milliseconds _persistInterval;
     bool _persistFileDownload;
-    QString _backupExtensionFormat;
-    int _backupInterval;
     int _maxBackupVersions;
 
     time_t _started;

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -58,6 +58,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
     DependencyManager::set<ResourceManager>();
+    DependencyManager::set<PluginManager>();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -572,6 +573,8 @@ void EntityScriptServer::aboutToFinish() {
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
+    DependencyManager::destroy<PluginManager>();
+
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();
     DependencyManager::destroy<ScriptEngines>();

cmake/externals/etc2comp/CMakeLists.txt

@@ -33,23 +33,26 @@ ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
-if (WIN32)
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/build/EtcLib/Debug/EtcLib.lib CACHE FILEPATH "Path to Etc2Comp debug library")
+if (WIN32 OR APPLE)
+  if (WIN32)
+    set(_LIB_FILE "EtcLib.lib")
+  else ()
+    set(_LIB_FILE "libEtcLib.a")
+  endif ()
+
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/build/EtcLib/Debug/${_LIB_FILE} CACHE FILEPATH "Path to Etc2Comp debug library")
 
   # use generator expression to ensure the correct library is found when building different configurations in VS
   set(_LIB_FOLDER "$<$<CONFIG:RelWithDebInfo>:build/EtcLib/RelWithDebInfo>")
   set(_LIB_FOLDER "${_LIB_FOLDER}$<$<CONFIG:MinSizeRel>:build/EtcLib/MinSizeRel>")
   set(_LIB_FOLDER "${_LIB_FOLDER}$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:build/EtcLib/Release>")
-
-  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/EtcLib.lib CACHE FILEPATH "Path to Etc2Comp release library")
-elseif (APPLE)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/build/EtcLib/Debug/libEtcLib.a CACHE FILEPATH "Path to EtcLib debug library")
-    set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/build/EtcLib/Release/libEtcLib.a CACHE FILEPATH "Path to EtcLib release library")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/${_LIB_FILE} CACHE FILEPATH "Path to Etc2Comp release library")
 else ()
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Path to EtcLib debug library")
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/build/EtcLib/libEtcLib.a CACHE FILEPATH "Path to EtcLib release library")
+
 endif ()
 
 set(ETC_INCLUDE_DIR ${SOURCE_DIR}/EtcLib/Etc CACHE FILEPATH "Path to Etc2Comp/Etc include directory")
 set(ETCCODEC_INCLUDE_DIR ${SOURCE_DIR}/EtcLib/EtcCodec CACHE FILEPATH "Path to Etc2Comp/EtcCodec include directory")
-# ETC2COMP_INCLUDE_DIRS will be set later by FindEtc2Comp
+# ETC2COMP_INCLUDE_DIRS will be set later by FindEtc2Comp

cmake/macros/OptionalWinExecutableSigning.cmake

@@ -22,7 +22,7 @@ macro(optional_win_executable_signing)
         # setup a post build command to sign the executable
         add_custom_command(
           TARGET ${TARGET_NAME} POST_BUILD
-          COMMAND ${SIGNTOOL_EXECUTABLE} sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://tsa.starfieldtech.com /td SHA256 ${EXECUTABLE_PATH}
+          COMMAND ${SIGNTOOL_EXECUTABLE} sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 ${EXECUTABLE_PATH}
         )
       else ()
         message(FATAL_ERROR "HF_PFX_PASSPHRASE must be set for executables to be signed.")

cmake/macros/SetPackagingParameters.cmake

@@ -18,6 +18,7 @@ macro(SET_PACKAGING_PARAMETERS)
   set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
   set(USE_STABLE_GLOBAL_SERVICES 0)
   set(BUILD_NUMBER 0)
+  set(APP_USER_MODEL_ID "com.highfidelity.sandbox-dev")
 
   set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
   set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")
@@ -95,7 +96,7 @@ macro(SET_PACKAGING_PARAMETERS)
     endif ()
 
     execute_process(
-      COMMAND git log -1 --format=${_GIT_LOG_FORMAT}
+      COMMAND git log -1 --abbrev=7 --format=${_GIT_LOG_FORMAT}
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       OUTPUT_VARIABLE _GIT_LOG_OUTPUT
       ERROR_VARIABLE _GIT_LOG_ERROR
@@ -172,6 +173,7 @@ macro(SET_PACKAGING_PARAMETERS)
     if (PRODUCTION_BUILD)
       set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
       set(CONSOLE_SHORTCUT_NAME "Sandbox")
+      set(APP_USER_MODEL_ID "com.highfidelity.sandbox")
     else ()
       set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION_NO_SHA}")
       set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")

cmake/macros/TargetBreakpad.cmake

@@ -0,0 +1,22 @@
+# 
+#  Copyright 2018 High Fidelity, Inc.
+#  Created by Gabriel Calero & Cristian Duarte on 2018/03/13
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+macro(TARGET_BREAKPAD)
+    if (ANDROID)
+        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/breakpad)
+        set(BREAKPAD_INCLUDE_DIRS "${INSTALL_DIR}/include" CACHE TYPE INTERNAL)
+        set(LIB_DIR ${INSTALL_DIR}/lib)
+        list(APPEND BREAKPAD_LIBRARIES ${LIB_DIR}/libbreakpad_client.a)
+        target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BREAKPAD_INCLUDE_DIRS})
+        if (USE_BREAKPAD)
+  	    	add_definitions(-DHAS_BREAKPAD)
+    	endif()
+    endif()
+    target_link_libraries(${TARGET_NAME} ${BREAKPAD_LIBRARIES})
+endmacro()
+
+

cmake/templates/CPackProperties.cmake.in

@@ -49,3 +49,4 @@ set(ADD_REMOVE_ICON_PATH "@ADD_REMOVE_ICON_PATH@")
 set(SERVER_COMPONENT_CONDITIONAL "@SERVER_COMPONENT_CONDITIONAL@")
 set(CLIENT_COMPONENT_CONDITIONAL "@CLIENT_COMPONENT_CONDITIONAL@")
 set(INSTALLER_TYPE "@INSTALLER_TYPE@")
+set(APP_USER_MODEL_ID "@APP_USER_MODEL_ID@")

cmake/templates/NSIS.template.in

@@ -131,7 +131,7 @@
     ; We need to sign it if it's a production or PR build.
     !if @PRODUCTION_BUILD@ == 1
       !if /FileExists "$%HF_PFX_FILE%"
-        !system '"@SIGNTOOL_EXECUTABLE@" sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://tsa.starfieldtech.com /td SHA256 $%TEMP%\@UNINSTALLER_NAME@' = 0
+        !system '"@SIGNTOOL_EXECUTABLE@" sign /fd sha256 /f %HF_PFX_FILE% /p %HF_PFX_PASSPHRASE% /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $%TEMP%\@UNINSTALLER_NAME@' = 0
       !else
         !warning "No signing file - installer will not be signed"
       !endif
@@ -909,6 +909,8 @@ Function HandlePostInstallOptions
     ${If} $DesktopServerState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
       !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
+      ; Set appUserModelId
+      ApplicationID::Set "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
     ${Else}
       !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
@@ -1166,6 +1168,8 @@ Section "-Core installation"
   ${If} @SERVER_COMPONENT_CONDITIONAL@
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" \
       "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
+    ; Set appUserModelId
+    ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
   ${EndIf}
 
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\@UNINSTALLER_NAME@"

cmake/templates/console-build-info.json.in

@@ -1,5 +1,8 @@
 {
     "releaseType": "@RELEASE_TYPE@",
+    "buildNumber": "@BUILD_NUMBER@",
+    "stableBuild": "@STABLE_BUILD@",
     "buildIdentifier": "@BUILD_VERSION@",
-    "organization": "@BUILD_ORGANIZATION@" 
+    "organization": "@BUILD_ORGANIZATION@",
+    "appUserModelId": "@APP_USER_MODEL_ID@"
 }

domain-server/src/DomainGatekeeper.cpp

@@ -412,7 +412,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
         } else if (verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) {
             // they sent us a username and the signature verifies it
             getGroupMemberships(username);
-            verifiedUsername = username;
+            verifiedUsername = username.toLower();
         } else {
             // they sent us a username, but it didn't check out
             requestUserPublicKey(username);
@@ -660,9 +660,8 @@ void DomainGatekeeper::requestUserPublicKey(const QString& username, bool isOpti
 
     // even if we have a public key for them right now, request a new one in case it has just changed
     JSONCallbackParameters callbackParams;
-    callbackParams.jsonCallbackReceiver = this;
+    callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "publicKeyJSONCallback";
-    callbackParams.errorCallbackReceiver = this;
     callbackParams.errorCallbackMethod = "publicKeyJSONErrorCallback";
 
 
@@ -675,19 +674,19 @@ void DomainGatekeeper::requestUserPublicKey(const QString& username, bool isOpti
                                               QNetworkAccessManager::GetOperation, callbackParams);
 }
 
-QString extractUsernameFromPublicKeyRequest(QNetworkReply& requestReply) {
+QString extractUsernameFromPublicKeyRequest(QNetworkReply* requestReply) {
     // extract the username from the request url
     QString username;
     const QString PUBLIC_KEY_URL_REGEX_STRING = "api\\/v1\\/users\\/([A-Za-z0-9_\\.]+)\\/public_key";
     QRegExp usernameRegex(PUBLIC_KEY_URL_REGEX_STRING);
-    if (usernameRegex.indexIn(requestReply.url().toString()) != -1) {
+    if (usernameRegex.indexIn(requestReply->url().toString()) != -1) {
         username = usernameRegex.cap(1);
     }
     return username.toLower();
 }
 
-void DomainGatekeeper::publicKeyJSONCallback(QNetworkReply& requestReply) {
-    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+void DomainGatekeeper::publicKeyJSONCallback(QNetworkReply* requestReply) {
+    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
     QString username = extractUsernameFromPublicKeyRequest(requestReply);
 
     bool isOptimisticKey = _inFlightPublicKeyRequests.take(username);
@@ -707,8 +706,8 @@ void DomainGatekeeper::publicKeyJSONCallback(QNetworkReply& requestReply) {
     }
 }
 
-void DomainGatekeeper::publicKeyJSONErrorCallback(QNetworkReply& requestReply) {
-    qDebug() << "publicKey api call failed:" << requestReply.error();
+void DomainGatekeeper::publicKeyJSONErrorCallback(QNetworkReply* requestReply) {
+    qDebug() << "publicKey api call failed:" << requestReply->error();
     QString username = extractUsernameFromPublicKeyRequest(requestReply);
     _inFlightPublicKeyRequests.remove(username);
 }
@@ -893,9 +892,8 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) {
 
 
     JSONCallbackParameters callbackParams;
-    callbackParams.jsonCallbackReceiver = this;
+    callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "getIsGroupMemberJSONCallback";
-    callbackParams.errorCallbackReceiver = this;
     callbackParams.errorCallbackMethod = "getIsGroupMemberErrorCallback";
 
     const QString GET_IS_GROUP_MEMBER_PATH = "api/v1/groups/members/%2";
@@ -906,18 +904,18 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) {
 
 }
 
-QString extractUsernameFromGroupMembershipsReply(QNetworkReply& requestReply) {
+QString extractUsernameFromGroupMembershipsReply(QNetworkReply* requestReply) {
     // extract the username from the request url
     QString username;
     const QString GROUP_MEMBERSHIPS_URL_REGEX_STRING = "api\\/v1\\/groups\\/members\\/([A-Za-z0-9_\\.]+)";
     QRegExp usernameRegex(GROUP_MEMBERSHIPS_URL_REGEX_STRING);
-    if (usernameRegex.indexIn(requestReply.url().toString()) != -1) {
+    if (usernameRegex.indexIn(requestReply->url().toString()) != -1) {
         username = usernameRegex.cap(1);
     }
     return username.toLower();
 }
 
-void DomainGatekeeper::getIsGroupMemberJSONCallback(QNetworkReply& requestReply) {
+void DomainGatekeeper::getIsGroupMemberJSONCallback(QNetworkReply* requestReply) {
     // {
     //     "data":{
     //         "username":"sethalves",
@@ -934,7 +932,7 @@ void DomainGatekeeper::getIsGroupMemberJSONCallback(QNetworkReply& requestReply)
     //     "status":"success"
     // }
 
-    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
     if (jsonObject["status"].toString() == "success") {
         QJsonObject data = jsonObject["data"].toObject();
         QJsonObject groups = data["groups"].toObject();
@@ -953,16 +951,15 @@ void DomainGatekeeper::getIsGroupMemberJSONCallback(QNetworkReply& requestReply)
     _inFlightGroupMembershipsRequests.remove(extractUsernameFromGroupMembershipsReply(requestReply));
 }
 
-void DomainGatekeeper::getIsGroupMemberErrorCallback(QNetworkReply& requestReply) {
-    qDebug() << "getIsGroupMember api call failed:" << requestReply.error();
+void DomainGatekeeper::getIsGroupMemberErrorCallback(QNetworkReply* requestReply) {
+    qDebug() << "getIsGroupMember api call failed:" << requestReply->error();
     _inFlightGroupMembershipsRequests.remove(extractUsernameFromGroupMembershipsReply(requestReply));
 }
 
 void DomainGatekeeper::getDomainOwnerFriendsList() {
     JSONCallbackParameters callbackParams;
-    callbackParams.jsonCallbackReceiver = this;
+    callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "getDomainOwnerFriendsListJSONCallback";
-    callbackParams.errorCallbackReceiver = this;
     callbackParams.errorCallbackMethod = "getDomainOwnerFriendsListErrorCallback";
 
     const QString GET_FRIENDS_LIST_PATH = "api/v1/user/friends";
@@ -974,7 +971,7 @@ void DomainGatekeeper::getDomainOwnerFriendsList() {
     
 }
 
-void DomainGatekeeper::getDomainOwnerFriendsListJSONCallback(QNetworkReply& requestReply) {
+void DomainGatekeeper::getDomainOwnerFriendsListJSONCallback(QNetworkReply* requestReply) {
     // {
     //     status: "success",
     //     data: {
@@ -991,20 +988,20 @@ void DomainGatekeeper::getDomainOwnerFriendsListJSONCallback(QNetworkReply& requ
     //         ]
     //     }
     // }
-    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
     if (jsonObject["status"].toString() == "success") {
         _domainOwnerFriends.clear();
         QJsonArray friends = jsonObject["data"].toObject()["friends"].toArray();
         for (int i = 0; i < friends.size(); i++) {
-            _domainOwnerFriends += friends.at(i).toString();
+            _domainOwnerFriends += friends.at(i).toString().toLower();
         }
     } else {
         qDebug() << "getDomainOwnerFriendsList api call returned:" << QJsonDocument(jsonObject).toJson(QJsonDocument::Compact);
     }
 }
 
-void DomainGatekeeper::getDomainOwnerFriendsListErrorCallback(QNetworkReply& requestReply) {
-    qDebug() << "getDomainOwnerFriendsList api call failed:" << requestReply.error();
+void DomainGatekeeper::getDomainOwnerFriendsListErrorCallback(QNetworkReply* requestReply) {
+    qDebug() << "getDomainOwnerFriendsList api call failed:" << requestReply->error();
 }
 
 void DomainGatekeeper::refreshGroupsCache() {

domain-server/src/DomainGatekeeper.h

@@ -51,14 +51,14 @@ public slots:
     void processICEPingReplyPacket(QSharedPointer<ReceivedMessage> message);
     void processICEPeerInformationPacket(QSharedPointer<ReceivedMessage> message);
 
-    void publicKeyJSONCallback(QNetworkReply& requestReply);
-    void publicKeyJSONErrorCallback(QNetworkReply& requestReply);
+    void publicKeyJSONCallback(QNetworkReply* requestReply);
+    void publicKeyJSONErrorCallback(QNetworkReply* requestReply);
 
-    void getIsGroupMemberJSONCallback(QNetworkReply& requestReply);
-    void getIsGroupMemberErrorCallback(QNetworkReply& requestReply);
+    void getIsGroupMemberJSONCallback(QNetworkReply* requestReply);
+    void getIsGroupMemberErrorCallback(QNetworkReply* requestReply);
 
-    void getDomainOwnerFriendsListJSONCallback(QNetworkReply& requestReply);
-    void getDomainOwnerFriendsListErrorCallback(QNetworkReply& requestReply);
+    void getDomainOwnerFriendsListJSONCallback(QNetworkReply* requestReply);
+    void getDomainOwnerFriendsListErrorCallback(QNetworkReply* requestReply);
 
     void refreshGroupsCache();
 

domain-server/src/DomainServer.cpp

@@ -514,13 +514,13 @@ void DomainServer::getTemporaryName(bool force) {
 
     // request a temporary name from the metaverse
     auto accountManager = DependencyManager::get<AccountManager>();
-    JSONCallbackParameters callbackParameters { this, "handleTempDomainSuccess", this, "handleTempDomainError" };
+    JSONCallbackParameters callbackParameters { this, "handleTempDomainSuccess", "handleTempDomainError" };
     accountManager->sendRequest("/api/v1/domains/temporary", AccountManagerAuth::None,
                                 QNetworkAccessManager::PostOperation, callbackParameters);
 }
 
-void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) {
-    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+void DomainServer::handleTempDomainSuccess(QNetworkReply* requestReply) {
+    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
 
     // grab the information for the new domain
     static const QString DATA_KEY = "data";
@@ -565,7 +565,7 @@ void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) {
     }
 }
 
-void DomainServer::handleTempDomainError(QNetworkReply& requestReply) {
+void DomainServer::handleTempDomainError(QNetworkReply* requestReply) {
     qWarning() << "A temporary name was requested but there was an error creating one. Please try again via domain-server relaunch"
         << "or from the domain-server settings.";
 }
@@ -1345,7 +1345,7 @@ void DomainServer::sendPendingTransactionsToServer() {
 
         JSONCallbackParameters transactionCallbackParams;
 
-        transactionCallbackParams.jsonCallbackReceiver = this;
+        transactionCallbackParams.callbackReceiver = this;
         transactionCallbackParams.jsonCallbackMethod = "transactionJSONCallback";
 
         while (i != _pendingAssignmentCredits.end()) {
@@ -1449,11 +1449,11 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
     DependencyManager::get<AccountManager>()->sendRequest(DOMAIN_UPDATE.arg(uuidStringWithoutCurlyBraces(getID())),
                                               AccountManagerAuth::Optional,
                                               QNetworkAccessManager::PutOperation,
-                                              JSONCallbackParameters(nullptr, QString(), this, "handleMetaverseHeartbeatError"),
+                                              JSONCallbackParameters(this, QString(), "handleMetaverseHeartbeatError"),
                                               domainUpdateJSON.toUtf8());
 }
 
-void DomainServer::handleMetaverseHeartbeatError(QNetworkReply& requestReply) {
+void DomainServer::handleMetaverseHeartbeatError(QNetworkReply* requestReply) {
     if (!_metaverseHeartbeatTimer) {
         // avoid rehandling errors from the same issue
         return;
@@ -1462,13 +1462,13 @@ void DomainServer::handleMetaverseHeartbeatError(QNetworkReply& requestReply) {
     // only attempt to grab a new temporary name if we're already a temporary domain server
     if (_type == MetaverseTemporaryDomain) {
         // check if we need to force a new temporary domain name
-        switch (requestReply.error()) {
+        switch (requestReply->error()) {
                 // if we have a temporary domain with a bad token, we get a 401
             case QNetworkReply::NetworkError::AuthenticationRequiredError: {
                 static const QString DATA_KEY = "data";
                 static const QString TOKEN_KEY = "api_key";
 
-                QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+                QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
                 auto tokenFailure = jsonObject[DATA_KEY].toObject()[TOKEN_KEY];
 
                 if (!tokenFailure.isNull()) {
@@ -1531,9 +1531,8 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() {
 
     // make sure we hear about failure so we can retry
     JSONCallbackParameters callbackParameters;
-    callbackParameters.errorCallbackReceiver = this;
+    callbackParameters.callbackReceiver = this;
     callbackParameters.errorCallbackMethod = "handleFailedICEServerAddressUpdate";
-    callbackParameters.jsonCallbackReceiver = this;
     callbackParameters.jsonCallbackMethod = "handleSuccessfulICEServerAddressUpdate";
 
     static bool printedIceServerMessage = false;
@@ -1552,7 +1551,7 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() {
                                                           domainUpdateJSON.toUtf8());
 }
 
-void DomainServer::handleSuccessfulICEServerAddressUpdate(QNetworkReply& requestReply) {
+void DomainServer::handleSuccessfulICEServerAddressUpdate(QNetworkReply* requestReply) {
     _sendICEServerAddressToMetaverseAPIInProgress = false;
     if (_sendICEServerAddressToMetaverseAPIRedo) {
         qDebug() << "ice-server address updated with metaverse, but has since changed.  redoing update...";
@@ -1563,7 +1562,7 @@ void DomainServer::handleSuccessfulICEServerAddressUpdate(QNetworkReply& request
     }
 }
 
-void DomainServer::handleFailedICEServerAddressUpdate(QNetworkReply& requestReply) {
+void DomainServer::handleFailedICEServerAddressUpdate(QNetworkReply* requestReply) {
     _sendICEServerAddressToMetaverseAPIInProgress = false;
     if (_sendICEServerAddressToMetaverseAPIRedo) {
         // if we have new data, retry right away, even though the previous attempt didn't go well.
@@ -1573,7 +1572,7 @@ void DomainServer::handleFailedICEServerAddressUpdate(QNetworkReply& requestRepl
         const int ICE_SERVER_UPDATE_RETRY_MS = 2 * 1000;
 
         qWarning() << "Failed to update ice-server address with High Fidelity Metaverse - error was"
-                   << requestReply.errorString();
+                   << requestReply->errorString();
         qWarning() << "\tRe-attempting in" << ICE_SERVER_UPDATE_RETRY_MS / 1000 << "seconds";
 
         QTimer::singleShot(ICE_SERVER_UPDATE_RETRY_MS, this, SLOT(sendICEServerAddressToMetaverseAPI()));

domain-server/src/DomainServer.h

@@ -108,10 +108,10 @@ private slots:
     void sendHeartbeatToIceServer();
 
     void handleConnectedNode(SharedNodePointer newNode); 
-    void handleTempDomainSuccess(QNetworkReply& requestReply);
-    void handleTempDomainError(QNetworkReply& requestReply);
+    void handleTempDomainSuccess(QNetworkReply* requestReply);
+    void handleTempDomainError(QNetworkReply* requestReply);
 
-    void handleMetaverseHeartbeatError(QNetworkReply& requestReply);
+    void handleMetaverseHeartbeatError(QNetworkReply* requestReply);
 
     void queuedQuit(QString quitMessage, int exitCode);
 
@@ -121,8 +121,8 @@ private slots:
     void handleICEHostInfo(const QHostInfo& hostInfo);
 
     void sendICEServerAddressToMetaverseAPI();
-    void handleSuccessfulICEServerAddressUpdate(QNetworkReply& requestReply);
-    void handleFailedICEServerAddressUpdate(QNetworkReply& requestReply);
+    void handleSuccessfulICEServerAddressUpdate(QNetworkReply* requestReply);
+    void handleFailedICEServerAddressUpdate(QNetworkReply* requestReply);
 
     void updateReplicatedNodes();
     void updateDownstreamNodes();

domain-server/src/DomainServerSettingsManager.cpp

@@ -1815,9 +1815,8 @@ void DomainServerSettingsManager::apiRefreshGroupInformation() {
 
 void DomainServerSettingsManager::apiGetGroupID(const QString& groupName) {
     JSONCallbackParameters callbackParams;
-    callbackParams.jsonCallbackReceiver = this;
+    callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "apiGetGroupIDJSONCallback";
-    callbackParams.errorCallbackReceiver = this;
     callbackParams.errorCallbackMethod = "apiGetGroupIDErrorCallback";
 
     const QString GET_GROUP_ID_PATH = "api/v1/groups/names/%1";
@@ -1826,7 +1825,7 @@ void DomainServerSettingsManager::apiGetGroupID(const QString& groupName) {
                                                           QNetworkAccessManager::GetOperation, callbackParams);
 }
 
-void DomainServerSettingsManager::apiGetGroupIDJSONCallback(QNetworkReply& requestReply) {
+void DomainServerSettingsManager::apiGetGroupIDJSONCallback(QNetworkReply* requestReply) {
     // {
     //     "data":{
     //         "groups":[{
@@ -1857,7 +1856,7 @@ void DomainServerSettingsManager::apiGetGroupIDJSONCallback(QNetworkReply& reque
     //     },
     //     "status":"success"
     // }
-    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
     if (jsonObject["status"].toString() == "success") {
         QJsonArray groups = jsonObject["data"].toObject()["groups"].toArray();
         for (int i = 0; i < groups.size(); i++) {
@@ -1876,15 +1875,14 @@ void DomainServerSettingsManager::apiGetGroupIDJSONCallback(QNetworkReply& reque
     }
 }
 
-void DomainServerSettingsManager::apiGetGroupIDErrorCallback(QNetworkReply& requestReply) {
-    qDebug() << "******************** getGroupID api call failed:" << requestReply.error();
+void DomainServerSettingsManager::apiGetGroupIDErrorCallback(QNetworkReply* requestReply) {
+    qDebug() << "******************** getGroupID api call failed:" << requestReply->error();
 }
 
 void DomainServerSettingsManager::apiGetGroupRanks(const QUuid& groupID) {
     JSONCallbackParameters callbackParams;
-    callbackParams.jsonCallbackReceiver = this;
+    callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "apiGetGroupRanksJSONCallback";
-    callbackParams.errorCallbackReceiver = this;
     callbackParams.errorCallbackMethod = "apiGetGroupRanksErrorCallback";
 
     const QString GET_GROUP_RANKS_PATH = "api/v1/groups/%1/ranks";
@@ -1893,7 +1891,7 @@ void DomainServerSettingsManager::apiGetGroupRanks(const QUuid& groupID) {
                                                           QNetworkAccessManager::GetOperation, callbackParams);
 }
 
-void DomainServerSettingsManager::apiGetGroupRanksJSONCallback(QNetworkReply& requestReply) {
+void DomainServerSettingsManager::apiGetGroupRanksJSONCallback(QNetworkReply* requestReply) {
     // {
     //     "data":{
     //         "groups":{
@@ -1926,7 +1924,7 @@ void DomainServerSettingsManager::apiGetGroupRanksJSONCallback(QNetworkReply& re
     // }
 
     bool changed = false;
-    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+    QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
 
     if (jsonObject["status"].toString() == "success") {
         QJsonObject groups = jsonObject["data"].toObject()["groups"].toObject();
@@ -1972,8 +1970,8 @@ void DomainServerSettingsManager::apiGetGroupRanksJSONCallback(QNetworkReply& re
     }
 }
 
-void DomainServerSettingsManager::apiGetGroupRanksErrorCallback(QNetworkReply& requestReply) {
-    qDebug() << "******************** getGroupRanks api call failed:" << requestReply.error();
+void DomainServerSettingsManager::apiGetGroupRanksErrorCallback(QNetworkReply* requestReply) {
+    qDebug() << "******************** getGroupRanks api call failed:" << requestReply->error();
 }
 
 void DomainServerSettingsManager::recordGroupMembership(const QString& name, const QUuid groupID, QUuid rankID) {

domain-server/src/DomainServerSettingsManager.h

@@ -133,10 +133,10 @@ signals:
     void settingsUpdated();
 
 public slots:
-    void apiGetGroupIDJSONCallback(QNetworkReply& requestReply);
-    void apiGetGroupIDErrorCallback(QNetworkReply& requestReply);
-    void apiGetGroupRanksJSONCallback(QNetworkReply& requestReply);
-    void apiGetGroupRanksErrorCallback(QNetworkReply& requestReply);
+    void apiGetGroupIDJSONCallback(QNetworkReply* requestReply);
+    void apiGetGroupIDErrorCallback(QNetworkReply* requestReply);
+    void apiGetGroupRanksJSONCallback(QNetworkReply* requestReply);
+    void apiGetGroupRanksErrorCallback(QNetworkReply* requestReply);
 
 private slots:
     void processSettingsRequestPacket(QSharedPointer<ReceivedMessage> message);

interface/CMakeLists.txt

@@ -206,14 +206,13 @@ endif()
 
 # link required hifi libraries
 link_hifi_libraries(
-  shared task octree ktx gpu gl procedural graphics graphics-scripting render
+  shared workload task octree ktx gpu gl procedural graphics graphics-scripting render
   pointers
   recording fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics
   render-utils entities-renderer avatars-renderer ui qml auto-updater midi
   controllers plugins image trackers
   ui-plugins display-plugins input-plugins
-  workload
   ${PLATFORM_GL_BACKEND}
 )
 
@@ -226,6 +225,7 @@ target_openssl()
 target_bullet()
 target_opengl()
 add_crashpad()
+target_breakpad()
 
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})

interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml

@@ -135,6 +135,8 @@ Item {
 
                 placeholderText: qsTr("Password")
                 echoMode: TextInput.Password
+
+                Keys.onReturnPressed: linkAccountBody.login()
             }
     }
 

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -126,10 +126,12 @@ Item {
             activeFocusOnPress: true
 
             ShortcutText {
+                z: 10
                 anchors {
-                    verticalCenter: usernameField.textFieldLabel.verticalCenter
-                    left: usernameField.textFieldLabel.right
-                    leftMargin: 10
+                    left: usernameField.left
+                    top: usernameField.top
+                    leftMargin: usernameField.textFieldLabel.contentWidth + 10
+                    topMargin: -19
                 }
 
                 text: "<a href='https://highfidelity.com/users/password/new'>Forgot Username?</a>"
@@ -154,10 +156,12 @@ Item {
             activeFocusOnPress: true
 
             ShortcutText {
+                z: 10
                 anchors {
-                    verticalCenter: passwordField.textFieldLabel.verticalCenter
-                    left: passwordField.textFieldLabel.right
-                    leftMargin: 10
+                    left: passwordField.left
+                    top: passwordField.top
+                    leftMargin: passwordField.textFieldLabel.contentWidth + 10
+                    topMargin: -19
                 }
 
                 text: "<a href='https://highfidelity.com/users/password/new'>Forgot Password?</a>"
@@ -168,10 +172,13 @@ Item {
 
                 onLinkActivated: loginDialog.openUrl(link)
             }
+
             onFocusChanged: {
                 root.text = "";
                 root.isPassword = true;
             }
+
+            Keys.onReturnPressed: linkAccountBody.login()
         }
 
         CheckBox {

interface/resources/qml/LoginDialog/SignUpBody.qml

@@ -164,6 +164,8 @@ Item {
                 root.text = "";
                 root.isPassword = focus
             }
+
+            Keys.onReturnPressed: signupBody.signup()
         }
 
         Row {

interface/resources/qml/controls-uit/Button.qml

@@ -62,8 +62,6 @@ Original.Button {
                         hifi.buttons.pressedColor[control.color]
                     } else if (control.hovered) {
                         hifi.buttons.hoveredColor[control.color]
-                        }  else if (!control.hovered && control.focus) {
-                            hifi.buttons.focusedColor[control.color]
                     } else {
                         hifi.buttons.colorStart[control.color]
                     }
@@ -78,8 +76,6 @@ Original.Button {
                         hifi.buttons.pressedColor[control.color]
                     } else if (control.hovered) {
                         hifi.buttons.hoveredColor[control.color]
-                        } else if (!control.hovered && control.focus) {
-                            hifi.buttons.focusedColor[control.color]
                     } else {
                         hifi.buttons.colorFinish[control.color]
                     }

interface/resources/qml/controls-uit/ComboBox.qml

@@ -171,6 +171,10 @@ FocusScope {
         }
     }
 
+    function textAt(index) {
+        return comboBox.textAt(index);
+    }
+
     HifiControls.Label {
         id: comboBoxLabel
         text: root.label

interface/resources/qml/controls-uit/SpinBox.qml

@@ -17,6 +17,10 @@ import "../controls-uit" as HifiControls
 SpinBox {
     id: spinBox
 
+    HifiConstants {
+        id: hifi
+    }
+
     property int colorScheme: hifi.colorSchemes.light
     readonly property bool isLightColorScheme: colorScheme === hifi.colorSchemes.light
     property string label: ""
@@ -31,8 +35,8 @@ SpinBox {
     property real maximumValue: 0.0
 
     property real realValue: 0.0
-    property real realFrom: 0.0
-    property real realTo: 100.0
+    property real realFrom: minimumValue
+    property real realTo: maximumValue
     property real realStepSize: 1.0
 
     signal editingFinished()
@@ -53,7 +57,8 @@ SpinBox {
     onValueChanged: realValue = value/factor
 
     stepSize: realStepSize*factor
-    value: realValue*factor
+    value: Math.round(realValue*factor)
+
     to : realTo*factor
     from : realFrom*factor
 
@@ -81,6 +86,7 @@ SpinBox {
     }
 
     valueFromText: function(text, locale) {
+        spinBox.value = 0; // Force valueChanged signal to be emitted so that validator fires.
         return Number.fromLocaleString(locale, text)*factor;
     }
 
@@ -110,7 +116,7 @@ SpinBox {
             anchors.centerIn: parent
             text: hifi.glyphs.caratUp
             size: hifi.dimensions.spinnerSize
-            color: spinBox.down.pressed || spinBox.up.hovered ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray
+            color: spinBox.up.pressed || spinBox.up.hovered ? (isLightColorScheme ? hifi.colors.black : hifi.colors.white) : hifi.colors.gray
         }
     }
 
@@ -149,26 +155,14 @@ SpinBox {
         visible: spinBox.labelInside != ""
     }
 
-//    MouseArea {
-//        anchors.fill: parent
-//        propagateComposedEvents: true
-//        onWheel: {
-//            if(spinBox.activeFocus)
-//                wheel.accepted = false
-//            else
-//                wheel.accepted = true
-//        }
-//        onPressed: {
-//            mouse.accepted = false
-//        }
-//        onReleased: {
-//            mouse.accepted = false
-//        }
-//        onClicked: {
-//            mouse.accepted = false
-//        }
-//        onDoubleClicked: {
-//            mouse.accepted = false
-//        }
-//    }
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.NoButton
+        onWheel: {
+            if (wheel.angleDelta.y > 0)
+                value += stepSize
+            else
+                value -= stepSize
+        }
+    }
 }

interface/resources/qml/controls/TabletWebView.qml

@@ -11,7 +11,6 @@ Item {
     height: parent !== null ? parent.height : undefined
     property var parentStackItem: null
     property int headerHeight: 70
-    property string url
     property string scriptURL
     property bool keyboardEnabled: false
     property bool keyboardRaised: false
@@ -23,6 +22,7 @@ Item {
     property bool punctuationMode: false
     property bool passwordField: false
     property bool isDesktop: false
+    property alias url: web.url
     property alias webView: web.webViewCore
     property alias profile: web.webViewCoreProfile
     property bool remove: false
@@ -81,7 +81,7 @@ Item {
             color: hifi.colors.baseGray
             font.pixelSize: 12
             verticalAlignment: Text.AlignLeft
-            text: root.url
+            text: web.url
             anchors {
                 top: nav.bottom
                 horizontalCenter: parent.horizontalCenter;
@@ -131,11 +131,11 @@ Item {
 
     function loadUrl(url) {
         web.webViewCore.url = url
-        root.url = web.webViewCore.url;
     }
 
-    onUrlChanged: {
-        loadUrl(url);
+    Rectangle {
+        anchors.fill: web;
+        color: hifi.colors.white;
     }
 
     FlickableWebViewCore {

interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml

@@ -56,8 +56,8 @@ Preference {
             id: slider
             value: preference.value
             width: 100
-            minimumValue: MyAvatar.getDomainMinScale()
-            maximumValue: MyAvatar.getDomainMaxScale()
+            minimumValue: preference.min
+            maximumValue: preference.max
             stepSize: preference.step
             onValueChanged: {
                 spinner.realValue = value
@@ -74,8 +74,8 @@ Preference {
             id: spinner
             decimals: preference.decimals
             realValue: preference.value
-            minimumValue: MyAvatar.getDomainMinScale()
-            maximumValue: MyAvatar.getDomainMaxScale()
+            minimumValue: preference.min
+            maximumValue: preference.max
             width: 100
             onValueChanged: {
                 slider.value = realValue;

interface/resources/qml/hifi/Feed.qml

@@ -87,8 +87,8 @@ Column {
             description: description,
             online_users: data.details.connections || data.details.concurrency || 0,
             // Server currently doesn't give isStacked (undefined). Could give bool.
-            drillDownToPlace: (data.isStacked === undefined) ? (data.action !== 'concurrency') : data.isStacked,
-            isStacked: !!data.isStacked
+            drillDownToPlace: data.is_stacked || (data.action === 'concurrency'),
+            isStacked: !!data.is_stacked
         };
     }
 

interface/resources/qml/hifi/audio/Audio.qml

@@ -129,12 +129,10 @@ Rectangle {
                     id: stereoMic
                     spacing: muteMic.spacing;
                     text: qsTr("Enable stereo input");
-                    checked: AudioScriptingInterface.isStereoInput();
+                    checked: AudioScriptingInterface.isStereoInput;
                     onClicked: {
-                        var success = AudioScriptingInterface.setStereoInput(checked);
-                        if (!success) {
-                            checked = !checked;
-                        }
+                        AudioScriptingInterface.isStereoInput = checked;
+                        checked = Qt.binding(function() { return AudioScriptingInterface.isStereoInput; }); // restore binding
                     }
                 }
             }

interface/resources/qml/hifi/commerce/checkout/Checkout.qml

@@ -92,9 +92,9 @@ Rectangle {
 
         onBuyResult: {
             if (result.status !== 'success') {
-                failureErrorText.text = result.message;
+                failureErrorText.text = result.data.message;
                 root.activeView = "checkoutFailure";
-                UserActivityLogger.commercePurchaseFailure(root.itemId, root.itemAuthor, root.itemPrice, !root.alreadyOwned, result.message);
+                UserActivityLogger.commercePurchaseFailure(root.itemId, root.itemAuthor, root.itemPrice, !root.alreadyOwned, result.data.message);
             } else {
                 root.certificateId = result.data.certificate_id;
                 root.itemHref = result.data.download_url;

interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml

@@ -646,6 +646,7 @@ Item {
             height: 40;
             enabled: root.hasPermissionToRezThis &&
                 MyAvatar.skeletonModelURL !== root.itemHref &&
+                !root.wornEntityID &&
                 root.valid;
 
             onHoveredChanged: {

interface/resources/qml/hifi/commerce/purchases/Purchases.qml

@@ -957,7 +957,7 @@ Rectangle {
     function updateCurrentlyWornWearables(wearables) {
         for (var i = 0; i < purchasesModel.count; i++) {
             for (var j = 0; j < wearables.length; j++) {
-                if (purchasesModel.get(i).itemType === "wearable" &&
+                if (purchasesModel.get(i).item_type === "wearable" &&
                     wearables[j].entityCertID === purchasesModel.get(i).certificate_id &&
                     wearables[j].entityEdition.toString() === purchasesModel.get(i).edition_number) {
                     purchasesModel.setProperty(i, 'wornEntityID', wearables[j].entityID);

interface/resources/qml/hifi/commerce/wallet/Help.qml

@@ -253,7 +253,11 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                         } else if (link === "#blockchain") {
                             Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
                         } else if (link === "#bank") {
-                            Qt.openUrlExternally("hifi://BankOfHighFidelity");
+                            if ((Account.metaverseServerURL).toString().indexOf("staging") >= 0) {
+                                Qt.openUrlExternally("hifi://hifiqa-master-metaverse-staging"); // So that we can test in staging.
+                            } else {
+                                Qt.openUrlExternally("hifi://BankOfHighFidelity");
+                            }
                         } else if (link === "#support") {
                             Qt.openUrlExternally("mailto:support@highfidelity.com");
                         }

interface/resources/qml/hifi/commerce/wallet/WalletHome.qml

@@ -76,7 +76,7 @@ Item {
         anchors.top: parent.top;
         anchors.left: parent.left;
         anchors.leftMargin: 20;
-        width: parent.width/2;
+        width: parent.width/2 - anchors.leftMargin;
         height: 80;
     }
 
@@ -252,60 +252,6 @@ Item {
             anchors.bottom: parent.bottom;
             anchors.left: parent.left;
             anchors.right: parent.right;
-
-            Item {  // On empty history. We don't want to flash and then replace, so don't show until we know we're zero.
-                visible: transactionHistoryModel.count === 0 && transactionHistoryModel.currentPageToRetrieve < 0;
-                anchors.centerIn: parent;
-                width: parent.width - 12;
-                height: parent.height;
-
-                HifiControlsUit.Separator {
-                    colorScheme: 1;
-                    anchors.left: parent.left;
-                    anchors.right: parent.right;
-                    anchors.top: parent.top;
-                }
-
-                RalewayRegular {
-                    id: noActivityText;
-                    text: "Congrats! Your wallet is all set!<br><br>" +
-                        "<b>Where's my HFC?</b><br>" +
-                        "High Fidelity commerce is in open beta right now. Want more HFC? Get it by meeting with a banker at " +
-                        "<a href='#goToBank'>BankOfHighFidelity</a>!"
-                    // Text size
-                    size: 22;
-                    // Style
-                    color: hifi.colors.blueAccent;
-                    anchors.top: parent.top;
-                    anchors.topMargin: 36;
-                    anchors.left: parent.left;
-                    anchors.leftMargin: 12;
-                    anchors.right: parent.right;
-                    anchors.rightMargin: 12;
-                    height: paintedHeight;
-                    wrapMode: Text.WordWrap;
-                    horizontalAlignment: Text.AlignHCenter;
-
-                    onLinkActivated: {
-                        sendSignalToWallet({ method: "transactionHistory_goToBank" });
-                    }
-                }
-
-                HifiControlsUit.Button {
-                    id: bankButton;
-                    color: hifi.buttons.blue;
-                    colorScheme: hifi.colorSchemes.dark;
-                    anchors.top: noActivityText.bottom;
-                    anchors.topMargin: 30;
-                    anchors.horizontalCenter: parent.horizontalCenter;
-                    width: parent.width/2;
-                    height: 50;
-                    text: "VISIT BANK OF HIGH FIDELITY";
-                    onClicked: {
-                        sendSignalToWallet({ method: "transactionHistory_goToBank" });
-                    }
-                }
-            }
             
             ListView {
                 id: transactionHistory;
@@ -407,6 +353,64 @@ Item {
                     }
                 }
             }
+
+            Item {
+                // On empty history. We don't want to flash and then replace, so don't show until we know we should.
+                // The history is empty when it contains 1 item (the pending item count) AND there are no pending items.
+                visible: transactionHistoryModel.count === 1 &&
+                    transactionHistoryModel.retrievedAtLeastOnePage &&
+                    transactionHistoryModel.get(0).count === 0;
+                anchors.centerIn: parent;
+                width: parent.width - 12;
+                height: parent.height;
+
+                HifiControlsUit.Separator {
+                    colorScheme: 1;
+                    anchors.left: parent.left;
+                    anchors.right: parent.right;
+                    anchors.top: parent.top;
+                }
+
+                RalewayRegular {
+                    id: noActivityText;
+                    text: "Congrats! Your wallet is all set!<br><br>" +
+                        "<b>Where's my HFC?</b><br>" +
+                        "High Fidelity commerce is in open beta right now. Want more HFC? Get it by meeting with a banker at " +
+                        "<a href='#goToBank'>BankOfHighFidelity</a>!"
+                    // Text size
+                    size: 22;
+                    // Style
+                    color: hifi.colors.blueAccent;
+                    anchors.top: parent.top;
+                    anchors.topMargin: 36;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 12;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 12;
+                    height: paintedHeight;
+                    wrapMode: Text.WordWrap;
+                    horizontalAlignment: Text.AlignHCenter;
+
+                    onLinkActivated: {
+                        sendSignalToWallet({ method: "transactionHistory_goToBank" });
+                    }
+                }
+
+                HifiControlsUit.Button {
+                    id: bankButton;
+                    color: hifi.buttons.blue;
+                    colorScheme: hifi.colorSchemes.dark;
+                    anchors.top: noActivityText.bottom;
+                    anchors.topMargin: 30;
+                    anchors.horizontalCenter: parent.horizontalCenter;
+                    width: parent.width/2;
+                    height: 50;
+                    text: "VISIT BANK OF HIGH FIDELITY";
+                    onClicked: {
+                        sendSignalToWallet({ method: "transactionHistory_goToBank" });
+                    }
+                }
+            }
         }
     }
 

interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml

@@ -17,7 +17,7 @@ PreferencesDialog {
     id: root
     objectName: "GeneralPreferencesDialog"
     title: "General Settings"
-    showCategories: ["User Interface", "HMD", "Snapshots", "Privacy"]
+    showCategories: ["User Interface", "Mouse Sensitivity", "HMD", "Snapshots", "Privacy"]
     property var settings: Settings {
         category: root.objectName
         property alias x: root.x

interface/resources/qml/hifi/dialogs/attachments/Attachment.qml

@@ -119,8 +119,8 @@ Item {
                 colorScheme: hifi.colorSchemes.dark
                 currentIndex: attachment ? model.indexOf(attachment.jointName) : -1
                 onCurrentIndexChanged: {
-                    if (completed && attachment && currentIndex != -1 && currentText && currentText !== attachment.jointName) {
-                        attachment.jointName = currentText;
+                    if (completed && attachment && currentIndex != -1 && attachment.jointName !== model[currentIndex]) {
+                        attachment.jointName = model[currentIndex];
                         updateAttachment();
                     }
                 }

interface/resources/qml/hifi/tablet/ControllerSettings.qml

@@ -69,10 +69,16 @@ Item {
             id: stack
             initialItem: inputConfiguration
             property alias messageVisible: imageMessageBox.visible
-            property alias selectedPlugin: box.currentText
+            property string selectedPlugin: ""
             Rectangle {
                 id: inputConfiguration
-                anchors.fill: parent
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    right: parent.right
+                }
+
+                height: 230
 
                 HifiConstants { id: hifi }
 
@@ -168,7 +174,7 @@ Item {
                         text: "show all input devices"
 
                         onClicked: {
-                            inputPlugins();
+                            box.model = inputPlugins();
                             changeSource();
                         }
                     }
@@ -208,25 +214,28 @@ Item {
                     anchors.leftMargin: 10
                     anchors.topMargin: 30
                 }
+            }
 
+            Rectangle {
+                id: loaderRectangle
+                z: -1
+                color: hifi.colors.baseGray
+                width: parent.width
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: inputConfiguration.bottom
+                anchors.bottom: parent.bottom
                 Loader {
                     id: loader
                     asynchronous: false
-
-                    width: inputConfiguration.width
-                    anchors.left: inputConfiguration.left
-                    anchors.right: inputConfiguration.right
-                    anchors.top: configurationHeader.bottom
-                    anchors.topMargin: 10
-                    anchors.bottom: inputConfiguration.bottom
-
-                    source: InputConfiguration.configurationLayout(box.currentText);
+                    anchors.fill: parent
+                    source: InputConfiguration.configurationLayout(box.textAt(box.currentIndex));
                     onLoaded: {
                         if (loader.item.hasOwnProperty("pluginName")) {
-                    if (box.currentText === "HTC Vive") {
+                            if (box.textAt(box.currentIndex) === "HTC Vive") {
                                 loader.item.pluginName = "OpenVR";
                             } else {
-                                loader.item.pluginName = box.currentText;
+                                loader.item.pluginName = box.textAt(box.currentIndex);
                             }
                         }
 
@@ -252,11 +261,12 @@ Item {
 
             function changeSource() {
                 loader.source = "";
+                var selectedDevice = box.textAt(box.currentIndex);
                 var source = "";
-                if (box.currentText == "Vive") {
+                if (selectedDevice == "HTC Vive") {
                     source = InputConfiguration.configurationLayout("OpenVR");
                 } else {
-                    source = InputConfiguration.configurationLayout(box.currentText);
+                    source = InputConfiguration.configurationLayout(selectedDevice);
                 }
 
                 loader.source = source;
@@ -265,6 +275,8 @@ Item {
                 } else {
                     box.label = "";
                 }
+
+                stack.selectedPlugin = selectedDevice;
             }
 
             Timer {

interface/resources/qml/hifi/tablet/NewModelDialog.qml

@@ -24,6 +24,7 @@ Rectangle {
     color: hifi.colors.baseGray;
     signal sendToScript(var message);
     property bool keyboardEnabled: false
+    property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool keyboardRasied: false
 
@@ -235,10 +236,11 @@ Rectangle {
 
     Keyboard {
         id: keyboard
-        raised: parent.keyboardEnabled
+        raised: parent.keyboardEnabled && parent.keyboardRaised
         numeric: parent.punctuationMode
         anchors {
             bottom: parent.bottom
+            bottomMargin: 40
             left: parent.left
             right: parent.right
         }

interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml

@@ -32,6 +32,6 @@ StackView {
     TabletPreferencesDialog {
         id: root
         objectName: "TabletGeneralPreferences"
-        showCategories: ["User Interface", "HMD", "Snapshots", "Privacy"]
+        showCategories: ["User Interface", "Mouse Sensitivity", "HMD", "Snapshots", "Privacy"]
     }
 }

interface/src/AndroidHelper.cpp

@@ -10,31 +10,11 @@
 //
 #include "AndroidHelper.h"
 #include <QDebug>
-#include <AccountManager.h>
 
 AndroidHelper::AndroidHelper() {
 }
 
 AndroidHelper::~AndroidHelper() {
-    workerThread.quit();
-    workerThread.wait();
-}
-
-void AndroidHelper::init() {
-    workerThread.start();
-    _accountManager = QSharedPointer<AccountManager>(new AccountManager, &QObject::deleteLater);
-    _accountManager->setIsAgent(true);
-    _accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL());
-    _accountManager->setSessionID(DependencyManager::get<AccountManager>()->getSessionID());
-    connect(_accountManager.data(), &AccountManager::loginComplete, [](const QUrl& authURL) {
-            DependencyManager::get<AccountManager>()->setAccountInfo(AndroidHelper::instance().getAccountManager()->getAccountInfo());
-            DependencyManager::get<AccountManager>()->setAuthURL(authURL);
-    });
-
-    connect(_accountManager.data(), &AccountManager::logoutComplete, [] () {
-            DependencyManager::get<AccountManager>()->logout();
-    });
-    _accountManager->moveToThread(&workerThread);
 }
 
 void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene) {

interface/src/AndroidHelper.h

@@ -13,8 +13,6 @@
 #define hifi_Android_Helper_h
 
 #include <QObject>
-#include <QThread>
-#include <AccountManager.h>
 
 class AndroidHelper : public QObject {
     Q_OBJECT
@@ -23,7 +21,6 @@ public:
             static AndroidHelper instance;
             return instance;
     }
-    void init();
     void requestActivity(const QString &activityName, const bool backToScene);
     void notifyLoadComplete();
     void notifyEnterForeground();
@@ -31,7 +28,6 @@ public:
 
     void performHapticFeedback(int duration);
 
-    QSharedPointer<AccountManager> getAccountManager() { return _accountManager; }
     AndroidHelper(AndroidHelper const&)  = delete;
     void operator=(AndroidHelper const&) = delete;
 
@@ -49,8 +45,6 @@ signals:
 private:
     AndroidHelper();
     ~AndroidHelper();
-    QSharedPointer<AccountManager> _accountManager;
-    QThread workerThread;
 };
 
 #endif

interface/src/Application.cpp

@@ -150,8 +150,8 @@
 #include "audio/AudioScope.h"
 #include "avatar/AvatarManager.h"
 #include "avatar/MyHead.h"
+#include "CrashRecoveryHandler.h"
 #include "CrashHandler.h"
-#include "Crashpad.h"
 #include "devices/DdeFaceTracker.h"
 #include "DiscoverabilityManager.h"
 #include "GLCanvas.h"
@@ -198,7 +198,6 @@
 
 #include <GPUIdent.h>
 #include <gl/GLHelpers.h>
-#include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
 #include <src/scripting/GooglePolyScriptingInterface.h>
 #include <EntityScriptClient.h>
 #include <ModelScriptingInterface.h>
@@ -270,9 +269,6 @@ public:
         }
         _renderContext->doneCurrent();
 
-        // Deleting the object with automatically shutdown the thread
-        connect(qApp, &QCoreApplication::aboutToQuit, this, &QObject::deleteLater);
-
         // Transfer to a new thread
         moveToNewNamedThread(this, "RenderThread", [this](QThread* renderThread) {
             hifi::qt::addBlockingForbiddenThread("Render", renderThread);
@@ -283,7 +279,9 @@ public:
 
 private:
     void initialize() {
+        setObjectName("Render");
         PROFILE_SET_THREAD_NAME("Render");
+        setCrashAnnotation("render_thread_id", std::to_string((size_t)QThread::currentThreadId()));
         if (!_renderContext->makeCurrent()) {
             qFatal("Unable to make rendering context current on render thread");
         }
@@ -792,7 +790,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
 
     bool previousSessionCrashed { false };
     if (!inTestMode) {
-        previousSessionCrashed = CrashHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt);
+        previousSessionCrashed = CrashRecoveryHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt);
     }
 
     // get dir to use for cache
@@ -813,6 +811,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     }
 
     // Tell the plugin manager about our statically linked plugins
+    DependencyManager::set<PluginManager>();
     auto pluginManager = PluginManager::getInstance();
     pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
     pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
@@ -905,7 +904,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<DiscoverabilityManager>();
     DependencyManager::set<SceneScriptingInterface>();
     DependencyManager::set<OffscreenUi>();
-    DependencyManager::set<AutoUpdater>();
     DependencyManager::set<Midi>();
     DependencyManager::set<PathUtils>();
     DependencyManager::set<InterfaceDynamicFactory>();
@@ -922,7 +920,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<OffscreenQmlSurfaceCache>();
     DependencyManager::set<EntityScriptClient>();
     DependencyManager::set<EntityScriptServerLogClient>();
-    DependencyManager::set<LimitlessVoiceRecognitionScriptingInterface>();
     DependencyManager::set<GooglePolyScriptingInterface>();
     DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
     DependencyManager::set<AvatarBookmarks>();
@@ -1082,6 +1079,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     auto nodeList = DependencyManager::get<NodeList>();
     nodeList->startThread();
 
+    // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur
+    // before we tell MyAvatar to go to a new location in the new domain
+    auto addressManager = DependencyManager::get<AddressManager>();
+    addressManager->moveToThread(nodeList->thread());
+
     const char** constArgv = const_cast<const char**>(argv);
     if (cmdOptionExists(argc, constArgv, "--disableWatchdog")) {
         DISABLE_WATCHDOG = true;
@@ -1099,6 +1101,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _logger->setSessionID(accountManager->getSessionID());
 
     setCrashAnnotation("metaverse_session_id", accountManager->getSessionID().toString().toStdString());
+    setCrashAnnotation("main_thread_id", std::to_string((size_t)QThread::currentThreadId()));
 
     if (steamClient) {
         qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID();
@@ -1163,24 +1166,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     });
     audioIO->startThread();
 
-    auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>();
-    connect(audioIO.data(), &AudioClient::mutedByMixer, audioScriptingInterface.data(), &AudioScriptingInterface::mutedByMixer);
-    connect(audioIO.data(), &AudioClient::receivedFirstPacket, audioScriptingInterface.data(), &AudioScriptingInterface::receivedFirstPacket);
-    connect(audioIO.data(), &AudioClient::disconnected, audioScriptingInterface.data(), &AudioScriptingInterface::disconnected);
-    connect(audioIO.data(), &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) {
-        auto audioClient = DependencyManager::get<AudioClient>();
-        auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
-        auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldPosition();
-        float distance = glm::distance(myAvatarPosition, position);
-
-        if (distance < radius) {
-            audioClient->setMuted(true);
-            audioScriptingInterface->environmentMuted();
-        }
-    });
-    connect(this, &Application::activeDisplayPluginChanged,
-        reinterpret_cast<scripting::Audio*>(audioScriptingInterface.data()), &scripting::Audio::onContextChanged);
-
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
@@ -1244,16 +1229,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(accountManager.data(), &AccountManager::authRequired, dialogsManager.data(), &DialogsManager::showLoginDialog);
 #endif
     connect(accountManager.data(), &AccountManager::usernameChanged, this, &Application::updateWindowTitle);
-    connect(accountManager.data(), &AccountManager::usernameChanged, [](QString username){
-        setCrashAnnotation("username", username.toStdString());
-    });
 
     // set the account manager's root URL and trigger a login request if we don't have the access token
     accountManager->setIsAgent(true);
     accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL());
 
-    auto addressManager = DependencyManager::get<AddressManager>();
-
     // use our MyAvatar position and quat for address manager path
     addressManager->setPositionGetter([this]{ return getMyAvatar()->getWorldPosition(); });
     addressManager->setOrientationGetter([this]{ return getMyAvatar()->getWorldOrientation(); });
@@ -1369,11 +1349,37 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     initializeDisplayPlugins();
     qCDebug(interfaceapp, "Initialized Display");
 
+    // An audio device changed signal received before the display plugins are set up will cause a crash,
+    // so we defer the setup of the `scripting::Audio` class until this point
+    {
+        auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>();
+        connect(audioIO.data(), &AudioClient::mutedByMixer, audioScriptingInterface.data(), &AudioScriptingInterface::mutedByMixer);
+        connect(audioIO.data(), &AudioClient::receivedFirstPacket, audioScriptingInterface.data(), &AudioScriptingInterface::receivedFirstPacket);
+        connect(audioIO.data(), &AudioClient::disconnected, audioScriptingInterface.data(), &AudioScriptingInterface::disconnected);
+        connect(audioIO.data(), &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) {
+            auto audioClient = DependencyManager::get<AudioClient>();
+            auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
+            auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldPosition();
+            float distance = glm::distance(myAvatarPosition, position);
+
+            if (distance < radius) {
+                audioClient->setMuted(true);
+                audioScriptingInterface->environmentMuted();
+            }
+        });
+        connect(this, &Application::activeDisplayPluginChanged,
+            reinterpret_cast<scripting::Audio*>(audioScriptingInterface.data()), &scripting::Audio::onContextChanged);
+    }
+
     // Create the rendering engine.  This can be slow on some machines due to lots of
     // GPU pipeline creation.
     initializeRenderEngine();
     qCDebug(interfaceapp, "Initialized Render Engine.");
 
+    // Overlays need to exist before we set the ContextOverlayInterface dependency
+    _overlays.init(); // do this before scripts load
+    DependencyManager::set<ContextOverlayInterface>();
+
     // Initialize the user interface and menu system
     // Needs to happen AFTER the render engine initialization to access its configuration
     initializeUi();
@@ -1510,10 +1516,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // allow you to move an entity around in your hand
     _entityEditSender.setPacketsPerSecond(3000); // super high!!
 
-    // Overlays need to exist before we set the ContextOverlayInterface dependency
-    _overlays.init(); // do this before scripts load
-    DependencyManager::set<ContextOverlayInterface>();
-
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
@@ -1754,6 +1756,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     // set the local loopback interface for local sounds
     AudioInjector::setLocalAudioInterface(audioIO.data());
+    auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
     audioScriptingInterface->setLocalAudioInterface(audioIO.data());
     connect(audioIO.data(), &AudioClient::noiseGateOpened, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateOpened);
     connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed);
@@ -1776,10 +1779,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // If launched from Steam, let it handle updates
     const QString HIFI_NO_UPDATER_COMMAND_LINE_KEY = "--no-updater";
     bool noUpdater = arguments().indexOf(HIFI_NO_UPDATER_COMMAND_LINE_KEY) != -1;
-    if (!noUpdater) {
+    bool buildCanUpdate = BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable
+        || BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Master;
+    if (!noUpdater && buildCanUpdate) {
         constexpr auto INSTALLER_TYPE_CLIENT_ONLY = "client_only";
 
-        auto applicationUpdater = DependencyManager::get<AutoUpdater>();
+        auto applicationUpdater = DependencyManager::set<AutoUpdater>();
 
         AutoUpdater::InstallerType type = installerType == INSTALLER_TYPE_CLIENT_ONLY
             ? AutoUpdater::InstallerType::CLIENT_ONLY : AutoUpdater::InstallerType::FULL;
@@ -2242,9 +2247,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     DependencyManager::get<EntityTreeRenderer>()->setSetPrecisionPickingOperator([&](unsigned int rayPickID, bool value) {
         DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value);
     });
-    EntityTreeRenderer::setRenderDebugHullsOperator([] {
-        return Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls);
-    });
 
     // Preload Tablet sounds
     DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
@@ -2255,7 +2257,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 
 #if defined(Q_OS_ANDROID)
-    AndroidHelper::instance().init();
     connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
     connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
     AndroidHelper::instance().notifyLoadComplete();
@@ -2293,6 +2294,7 @@ void Application::domainConnectionRefused(const QString& reasonMessage, int reas
             QString message = "Unable to connect to the location you are visiting.\n";
             message += reasonMessage;
             OffscreenUi::asyncWarning("", message);
+            getMyAvatar()->setWorldVelocity(glm::vec3(0.0f));
             break;
         }
         default:
@@ -2538,6 +2540,8 @@ Application::~Application() {
     _main3DScene = nullptr;
     _renderEngine = nullptr;
 
+    _gameWorkload.shutdown();
+
     DependencyManager::destroy<Preferences>();
 
     _entityClipboard->eraseAllOctreeElements();
@@ -2549,25 +2553,28 @@ Application::~Application() {
     _octreeProcessor.terminate();
     _entityEditSender.terminate();
 
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->shutdown();
+    }
+    DependencyManager::destroy<PluginManager>();
+
+    DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache
+
     DependencyManager::destroy<AvatarManager>();
     DependencyManager::destroy<AnimationCache>();
     DependencyManager::destroy<FramebufferCache>();
     DependencyManager::destroy<TextureCache>();
     DependencyManager::destroy<ModelCache>();
-    DependencyManager::destroy<GeometryCache>();
     DependencyManager::destroy<ScriptCache>();
     DependencyManager::destroy<SoundCache>();
     DependencyManager::destroy<OctreeStatsProvider>();
+    DependencyManager::destroy<GeometryCache>();
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
     // remove the NodeList from the DependencyManager
     DependencyManager::destroy<NodeList>();
 
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        steamClient->shutdown();
-    }
-
 #if 0
     ConnexionClient::getInstance().destroy();
 #endif
@@ -2587,6 +2594,8 @@ Application::~Application() {
 
     // Can't log to file passed this point, FileLogger about to be deleted
     qInstallMessageHandler(LogHandler::verboseMessageHandler);
+    
+    _renderEventHandler->deleteLater();
 }
 
 void Application::initializeGL() {
@@ -2713,7 +2722,7 @@ void Application::initializeDisplayPlugins() {
     setDisplayPlugin(defaultDisplayPlugin);
 
     // Now set the desired plugin if it's not the same as the default plugin
-    if (targetDisplayPlugin != defaultDisplayPlugin) {
+    if (targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
         setDisplayPlugin(targetDisplayPlugin);
     }
 
@@ -2887,6 +2896,7 @@ void Application::initializeUi() {
     auto compositorHelper = DependencyManager::get<CompositorHelper>();
     connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
         if (isHMDMode()) {
+            auto compositorHelper = DependencyManager::get<CompositorHelper>(); // don't capture outer smartpointer
             showCursor(compositorHelper->getAllowMouseCapture() ?
                        Cursor::Manager::lookupIcon(_preferredCursor.get()) :
                        Cursor::Icon::SYSTEM);
@@ -2994,6 +3004,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
     surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
     surfaceContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
     surfaceContext->setContextProperty("Render", _renderEngine->getConfiguration().get());
+    surfaceContext->setContextProperty("Workload", _gameWorkload._engine->getConfiguration().get());
     surfaceContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface());
     surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
 
@@ -4533,6 +4544,10 @@ void Application::idle() {
         qFatal("Unable to make main thread context current");
     }
 
+    {
+        _gameWorkload.updateViews(_viewFrustum, getMyAvatar()->getHeadPosition());
+        _gameWorkload._engine->run();
+    }
     {
         PerformanceTimer perfTimer("update");
         PerformanceWarning warn(showWarnings, "Application::idle()... update()");
@@ -4928,6 +4943,9 @@ void Application::init() {
             avatar->setCollisionSound(sound);
         }
     }, Qt::QueuedConnection);
+
+    _gameWorkload.startup(getEntities()->getWorkloadSpace(), _main3DScene, _entitySimulation);
+    _entitySimulation->setWorkloadSpace(getEntities()->getWorkloadSpace());
 }
 
 void Application::loadAvatarScripts(const QVector<QString>& urls) {
@@ -5279,14 +5297,16 @@ void Application::setKeyboardFocusEntity(const EntityItemID& entityItemID) {
             auto entityId = _keyboardFocusedEntity.get();
             if (entities->wantsKeyboardFocus(entityId)) {
                 entities->setProxyWindow(entityId, _window->windowHandle());
-                auto entity = getEntities()->getEntity(entityId);
                 if (_keyboardMouseDevice->isActive()) {
                     _keyboardMouseDevice->pluginFocusOutEvent();
                 }
                 _lastAcceptedKeyPress = usecTimestampNow();
 
-                setKeyboardFocusHighlight(entity->getWorldPosition(), entity->getWorldOrientation(),
-                    entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR);
+                auto entity = getEntities()->getEntity(entityId);
+                if (entity) {
+                    setKeyboardFocusHighlight(entity->getWorldPosition(), entity->getWorldOrientation(),
+                        entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR);
+                }
             }
         }
     }
@@ -5614,7 +5634,10 @@ void Application::update(float deltaTime) {
     {
         PROFILE_RANGE(simulation_physics, "Simulation");
         PerformanceTimer perfTimer("simulation");
+
         if (_physicsEnabled) {
+            auto t0 = std::chrono::high_resolution_clock::now();
+            auto t1 = t0;
             {
                 PROFILE_RANGE(simulation_physics, "PrePhysics");
                 PerformanceTimer perfTimer("prePhysics)");
@@ -5638,6 +5661,8 @@ void Application::update(float deltaTime) {
 
                 _entitySimulation->applyDynamicChanges();
 
+                t1 = std::chrono::high_resolution_clock::now();
+
                 avatarManager->getObjectsToRemoveFromPhysics(motionStates);
                 _physicsEngine->removeObjects(motionStates);
                 avatarManager->getObjectsToAddToPhysics(motionStates);
@@ -5650,6 +5675,7 @@ void Application::update(float deltaTime) {
                     dynamic->prepareForPhysicsSimulation();
                 });
             }
+            auto t2 = std::chrono::high_resolution_clock::now();
             {
                 PROFILE_RANGE(simulation_physics, "StepPhysics");
                 PerformanceTimer perfTimer("stepPhysics");
@@ -5657,6 +5683,7 @@ void Application::update(float deltaTime) {
                     _physicsEngine->stepSimulation();
                 });
             }
+            auto t3 = std::chrono::high_resolution_clock::now();
             {
                 if (_physicsEngine->hasOutgoingChanges()) {
                     {
@@ -5702,12 +5729,26 @@ void Application::update(float deltaTime) {
                         // NOTE: the PhysicsEngine stats are written to stdout NOT to Qt log framework
                         _physicsEngine->dumpStatsIfNecessary();
                     }
+                    auto t4 = std::chrono::high_resolution_clock::now();
 
                     if (!_aboutToQuit) {
                         // NOTE: the getEntities()->update() call below will wait for lock
                         // and will provide non-physical entity motion
                         getEntities()->update(true); // update the models...
                     }
+
+                    auto t5 = std::chrono::high_resolution_clock::now();
+
+                    workload::Timings timings(6);
+                    timings[0] = (t4 - t0);
+                    timings[1] = (t5 - t4);
+                    timings[2] = (t4 - t3);
+                    timings[3] = (t3 - t2);
+                    timings[4] = (t2 - t1);
+                    timings[5] = (t1 - t0);
+
+                    _gameWorkload.updateSimulationTimings(timings);
+
                 }
             }
         } else {
@@ -5857,14 +5898,10 @@ void Application::update(float deltaTime) {
 
 
     {
-        PerformanceTimer perfTimer("limitless");
+        PerformanceTimer perfTimer("AnimDebugDraw");
         AnimDebugDraw::getInstance().update();
     }
 
-    {
-        PerformanceTimer perfTimer("limitless");
-        DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>()->update();
-    }
 
     { // Game loop is done, mark the end of the frame for the scene transactions and the render loop to take over
         PerformanceTimer perfTimer("enqueueFrame");
@@ -6173,6 +6210,8 @@ void Application::updateWindowTitle() const {
     QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
     QString username = accountManager->getAccountInfo().getUsername();
 
+    setCrashAnnotation("username", username.toStdString());
+
     QString currentPlaceName;
     if (isServerlessMode()) {
         currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
@@ -6563,6 +6602,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
 
     scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Render", _renderEngine->getConfiguration().get());
+    scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get());
 
     GraphicsScriptingInterface::registerMetaTypes(scriptEngine.data());
     scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data());
@@ -6573,7 +6613,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
 
-    scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data());
     scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data());
 
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
@@ -6944,7 +6983,9 @@ void Application::showAssetServerWidget(QString filePath) {
             DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);
         } else {
             static const QUrl url("hifi/dialogs/TabletAssetServer.qml");
-            tablet->pushOntoStack(url);
+            if (!tablet->isPathLoaded(url)) {
+                tablet->pushOntoStack(url);
+            }
         }
     }
 

interface/src/Application.h

@@ -72,6 +72,8 @@
 #include "ui/overlays/Overlays.h"
 #include "UndoStackScriptingInterface.h"
 
+#include "workload/GameWorkload.h"
+
 #include <procedural/ProceduralSkybox.h>
 #include <graphics/Skybox.h>
 #include <ModelScriptingInterface.h>
@@ -274,6 +276,8 @@ public:
     render::EnginePointer getRenderEngine() override { return _renderEngine; }
     gpu::ContextPointer getGPUContext() const { return _gpuContext; }
 
+    const GameWorkload& getGameWorkload() const { return _gameWorkload; }
+
     virtual void pushPostUpdateLambda(void* key, const std::function<void()>& func) override;
 
     void updateMyAvatarLookAtPosition();
@@ -657,6 +661,8 @@ private:
     render::EnginePointer _renderEngine{ new render::RenderEngine() };
     gpu::ContextPointer _gpuContext; // initialized during window creation
 
+    GameWorkload _gameWorkload;
+
     mutable QMutex _renderArgsMutex{ QMutex::Recursive };
     struct AppRenderArgs {
         render::Args _renderArgs;

interface/src/Application_render.cpp

@@ -139,7 +139,10 @@ void Application::paintGL() {
     frame->frameIndex = _renderFrameCount;
     frame->framebuffer = finalFramebuffer;
     frame->framebufferRecycler = [](const gpu::FramebufferPointer& framebuffer) {
-        DependencyManager::get<FramebufferCache>()->releaseFramebuffer(framebuffer);
+        auto frameBufferCache = DependencyManager::get<FramebufferCache>();
+        if (frameBufferCache) {
+            frameBufferCache->releaseFramebuffer(framebuffer);
+        }
     };
     // deliver final scene rendering commands to the display plugin
     {
@@ -205,10 +208,6 @@ void Application::runRenderFrame(RenderArgs* renderArgs) {
 
         RenderArgs::DebugFlags renderDebugFlags = RenderArgs::RENDER_DEBUG_NONE;
 
-        if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls)) {
-            renderDebugFlags = static_cast<RenderArgs::DebugFlags>(renderDebugFlags |
-                static_cast<int>(RenderArgs::RENDER_DEBUG_HULLS));
-        }
         renderArgs->_debugFlags = renderDebugFlags;
     }
 

interface/src/AvatarBookmarks.cpp

@@ -77,7 +77,7 @@ void addAvatarEntities(const QVariantList& avatarEntities) {
 
                 entity->setLastBroadcast(usecTimestampNow());
                 // since we're creating this object we will immediately volunteer to own its simulation
-                entity->flagForOwnershipBid(VOLUNTEER_SIMULATION_PRIORITY);
+                entity->setScriptSimulationPriority(VOLUNTEER_SIMULATION_PRIORITY);
                 entityProperties.setLastEdited(entity->getLastEdited());
             } else {
                 qCDebug(entities) << "AvatarEntitiesBookmark failed to add new Entity to local Octree";

interface/src/CrashHandler.h

@@ -2,8 +2,8 @@
 //  CrashHandler.h
 //  interface/src
 //
-//  Created by David Rowe on 24 Aug 2015.
-//  Copyright 2015 High Fidelity, Inc.
+//  Created by Clement Brisset on 01/19/18.
+//  Copyright 2018 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -12,22 +12,10 @@
 #ifndef hifi_CrashHandler_h
 #define hifi_CrashHandler_h
 
-#include <QString>
+#include <string>
 
-class CrashHandler {
+bool startCrashHandler();
+void setCrashAnnotation(std::string name, std::string value);
 
-public:
-    static bool checkForResetSettings(bool wasLikelyCrash, bool suppressPrompt = false);
 
-private:
-    enum Action {
-        DELETE_INTERFACE_INI,
-        RETAIN_IMPORTANT_INFO,
-        DO_NOTHING
-    };
-
-    static Action promptUserForAction(bool showCrashMessage);
-    static void handleCrash(Action action);
-};
-
-#endif // hifi_CrashHandler_h
+#endif

interface/src/CrashHandler_Breakpad.cpp

@@ -0,0 +1,79 @@
+//
+//  CrashHandler_Breakpad.cpp
+//  interface/src
+//
+//  Created by Clement Brisset on 01/19/18.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "CrashHandler.h"
+
+#if HAS_BREAKPAD
+
+#include <mutex>
+
+#include <client/linux/handler/exception_handler.h>
+#include <client/linux/handler/minidump_descriptor.h>
+
+#include <QDebug>
+#include <QMap>
+#include <QtCore/QFileInfo>
+#include <QtAndroidExtras/QAndroidJniObject>
+
+#include <SettingHelpers.h>
+#include <BuildInfo.h>
+
+google_breakpad::ExceptionHandler* gBreakpadHandler;
+
+std::mutex annotationMutex;
+QMap<QString, QString> annotations;
+
+static bool breakpad_dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded) {
+    return succeeded;
+}
+
+QString obbDir() {
+    QAndroidJniObject mediaDir = QAndroidJniObject::callStaticObjectMethod("android/os/Environment", "getExternalStorageDirectory", "()Ljava/io/File;");
+    QAndroidJniObject mediaPath = mediaDir.callObjectMethod( "getAbsolutePath", "()Ljava/lang/String;" );
+    QAndroidJniObject activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
+    QAndroidJniObject package = activity.callObjectMethod("getPackageName", "()Ljava/lang/String;");
+    QString dataAbsPath = mediaPath.toString()+"/Android/obb/" + package.toString();
+    return dataAbsPath;
+}
+
+void flushAnnotations() {
+    QSettings settings(obbDir() + "/annotations.json", JSON_FORMAT);
+    settings.clear();
+    settings.beginGroup("Annotations");
+    for (auto k : annotations.keys()) {
+        settings.setValue(k, annotations.value(k));
+    }
+    settings.endGroup();
+    settings.sync();
+}
+
+bool startCrashHandler() {
+    annotations["version"] = BuildInfo::VERSION;
+    annotations["build_number"] = BuildInfo::BUILD_NUMBER;
+    annotations["build_type"] = BuildInfo::BUILD_TYPE_STRING;
+
+    flushAnnotations();
+
+    gBreakpadHandler = new google_breakpad::ExceptionHandler(
+            google_breakpad::MinidumpDescriptor(obbDir().toStdString()),
+            nullptr, breakpad_dumpCallback, nullptr, true, -1);
+    return true;
+}
+
+void setCrashAnnotation(std::string name, std::string value) {
+    std::lock_guard<std::mutex> guard(annotationMutex);
+    QString qName = QString::fromStdString(name);
+    QString qValue = QString::fromStdString(value);
+    annotations[qName] = qValue;
+    flushAnnotations();
+}
+
+#endif

interface/src/CrashHandler_Crashpad.cpp

@@ -1,5 +1,5 @@
 //
-//  Crashpad.cpp
+//  CrashHandler_Crashpad.cpp
 //  interface/src
 //
 //  Created by Clement Brisset on 01/19/18.
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Crashpad.h"
+#include "CrashHandler.h"
 
 #include <assert.h>
 
@@ -117,14 +117,4 @@ void setCrashAnnotation(std::string name, std::string value) {
     crashpadAnnotations->SetKeyValue(name, value);
 }
 
-#else
-
-bool startCrashHandler() {
-    qDebug() << "No crash handler available.";
-    return false;
-}
-
-void setCrashAnnotation(std::string name, std::string value) {
-}
-
 #endif

interface/src/CrashHandler_None.cpp

@@ -0,0 +1,27 @@
+//
+//  CrashHandler_None.cpp
+//  interface/src
+//
+//  Created by Clement Brisset on 01/19/18.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "CrashHandler.h"
+
+#include <assert.h>
+#include <QDebug>
+
+#if !defined(HAS_CRASHPAD) && !defined(HAS_BREAKPAD)
+
+bool startCrashHandler() {
+    qDebug() << "No crash handler available.";
+    return false;
+}
+
+void setCrashAnnotation(std::string name, std::string value) {
+}
+
+#endif

interface/src/CrashRecoveryHandler.cpp

@@ -1,5 +1,5 @@
 //
-//  CrashHandler.cpp
+//  CrashRecoveryHandler.cpp
 //  interface/src
 //
 //  Created by David Rowe on 24 Aug 2015.
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "CrashHandler.h"
+#include "CrashRecoveryHandler.h"
 
 #include <QCoreApplication>
 #include <QDialog>
@@ -30,7 +30,7 @@
 #include <SettingHelpers.h>
 
 
-bool CrashHandler::checkForResetSettings(bool wasLikelyCrash, bool suppressPrompt) {
+bool CrashRecoveryHandler::checkForResetSettings(bool wasLikelyCrash, bool suppressPrompt) {
     QSettings::setDefaultFormat(JSON_FORMAT);
     QSettings settings;
     settings.beginGroup("Developer");
@@ -59,7 +59,7 @@ bool CrashHandler::checkForResetSettings(bool wasLikelyCrash, bool suppressPromp
     return wasLikelyCrash;
 }
 
-CrashHandler::Action CrashHandler::promptUserForAction(bool showCrashMessage) {
+CrashRecoveryHandler::Action CrashRecoveryHandler::promptUserForAction(bool showCrashMessage) {
     QDialog crashDialog;
     QLabel* label;
     if (showCrashMessage) {
@@ -94,20 +94,20 @@ CrashHandler::Action CrashHandler::promptUserForAction(bool showCrashMessage) {
 
     if (result == QDialog::Accepted) {
         if (option1->isChecked()) {
-            return CrashHandler::DELETE_INTERFACE_INI;
+            return CrashRecoveryHandler::DELETE_INTERFACE_INI;
         }
         if (option2->isChecked()) {
-            return CrashHandler::RETAIN_IMPORTANT_INFO;
+            return CrashRecoveryHandler::RETAIN_IMPORTANT_INFO;
         }
     }
 
     // Dialog cancelled or "do nothing" option chosen
-    return CrashHandler::DO_NOTHING;
+    return CrashRecoveryHandler::DO_NOTHING;
 }
 
-void CrashHandler::handleCrash(CrashHandler::Action action) {
-    if (action != CrashHandler::DELETE_INTERFACE_INI && action != CrashHandler::RETAIN_IMPORTANT_INFO) {
-        // CrashHandler::DO_NOTHING or unexpected value
+void CrashRecoveryHandler::handleCrash(CrashRecoveryHandler::Action action) {
+    if (action != CrashRecoveryHandler::DELETE_INTERFACE_INI && action != CrashRecoveryHandler::RETAIN_IMPORTANT_INFO) {
+        // CrashRecoveryHandler::DO_NOTHING or unexpected value
         return;
     }
 
@@ -126,7 +126,7 @@ void CrashHandler::handleCrash(CrashHandler::Action action) {
     QUrl address;
     bool tutorialComplete = false;
 
-    if (action == CrashHandler::RETAIN_IMPORTANT_INFO) {
+    if (action == CrashRecoveryHandler::RETAIN_IMPORTANT_INFO) {
         // Read avatar info
 
         // Location and orientation
@@ -151,7 +151,7 @@ void CrashHandler::handleCrash(CrashHandler::Action action) {
         settingsFile.remove();
     }
 
-    if (action == CrashHandler::RETAIN_IMPORTANT_INFO) {
+    if (action == CrashRecoveryHandler::RETAIN_IMPORTANT_INFO) {
         // Write avatar info
 
         // Location and orientation

interface/src/CrashRecoveryHandler.h

@@ -0,0 +1,33 @@
+//
+//  CrashRecoveryHandler.h
+//  interface/src
+//
+//  Created by David Rowe on 24 Aug 2015.
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_CrashRecoveryHandler_h
+#define hifi_CrashRecoveryHandler_h
+
+#include <QString>
+
+class CrashRecoveryHandler {
+
+public:
+    static bool checkForResetSettings(bool wasLikelyCrash, bool suppressPrompt = false);
+
+private:
+    enum Action {
+        DELETE_INTERFACE_INI,
+        RETAIN_IMPORTANT_INFO,
+        DO_NOTHING
+    };
+
+    static Action promptUserForAction(bool showCrashMessage);
+    static void handleCrash(Action action);
+};
+
+#endif // hifi_CrashRecoveryHandler_h

interface/src/Crashpad.h

@@ -1,20 +0,0 @@
-//
-//  Crashpad.h
-//  interface/src
-//
-//  Created by Clement Brisset on 01/19/18.
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_Crashpad_h
-#define hifi_Crashpad_h
-
-#include <string>
-
-bool startCrashHandler();
-void setCrashAnnotation(std::string name, std::string value);
-
-#endif // hifi_Crashpad_h

interface/src/DiscoverabilityManager.cpp

@@ -23,7 +23,7 @@
 #include <UserActivityLogger.h>
 #include <UUID.h>
 
-#include "Crashpad.h"
+#include "CrashHandler.h"
 #include "Menu.h"
 
 const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::Connections;
@@ -97,7 +97,7 @@ void DiscoverabilityManager::updateLocation() {
         locationObject.insert(AVAILABILITY_KEY_IN_LOCATION, findableByString(static_cast<Discoverability::Mode>(_mode.get())));
 
         JSONCallbackParameters callbackParameters;
-        callbackParameters.jsonCallbackReceiver = this;
+        callbackParameters.callbackReceiver = this;
         callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse";
 
         // figure out if we'll send a fresh location or just a simple heartbeat
@@ -121,7 +121,7 @@ void DiscoverabilityManager::updateLocation() {
         // we still send a heartbeat to the metaverse server for stats collection
 
         JSONCallbackParameters callbackParameters;
-        callbackParameters.jsonCallbackReceiver = this;
+        callbackParameters.callbackReceiver = this;
         callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse";
 
         accountManager->sendRequest(API_USER_HEARTBEAT_PATH, AccountManagerAuth::Optional,
@@ -136,7 +136,7 @@ void DiscoverabilityManager::updateLocation() {
     setCrashAnnotation("address", currentAddress.toString().toStdString());
 }
 
-void DiscoverabilityManager::handleHeartbeatResponse(QNetworkReply& requestReply) {
+void DiscoverabilityManager::handleHeartbeatResponse(QNetworkReply* requestReply) {
     auto dataObject = AccountManager::dataObjectFromResponse(requestReply);
 
     if (!dataObject.isEmpty()) {

interface/src/DiscoverabilityManager.h

@@ -51,7 +51,7 @@ public:
     static QString findableByString(Discoverability::Mode discoverabilityMode);
 
 private slots:
-    void handleHeartbeatResponse(QNetworkReply& requestReply);
+    void handleHeartbeatResponse(QNetworkReply* requestReply);
     
 private:
     DiscoverabilityManager();

interface/src/Menu.cpp

@@ -283,7 +283,7 @@ Menu::Menu() {
     MenuWrapper* settingsMenu = addMenu("Settings");
 
     // Settings > General...
-    action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr, QAction::PreferencesRole);
+    action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_G, nullptr, nullptr);
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"),
             QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog");
@@ -725,7 +725,6 @@ Menu::Menu() {
         addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,
             0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));
     }
-    addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls, 0, false, qApp->getEntities().data(), SIGNAL(setRenderDebugHulls()));
 
     addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletWireframe, 0, false, qApp, SLOT(setShowBulletWireframe(bool)));
     addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowBulletAABBs, 0, false, qApp, SLOT(setShowBulletAABBs(bool)));
@@ -813,7 +812,7 @@ Menu::Menu() {
     });
     essLogAction->setEnabled(nodeList->getThisNodeCanRez());
 
-    action = addActionToQMenuAndActionHash(developerMenu, "Script Log (HMD friendly)...", Qt::NoButton,
+    addActionToQMenuAndActionHash(developerMenu, "Script Log (HMD friendly)...", Qt::NoButton,
                                            qApp, SLOT(showScriptLogs()));
 
     addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::VerboseLogging, 0, false,

interface/src/Menu.h

@@ -141,7 +141,6 @@ namespace MenuOption {
     const QString Overlays = "Show Overlays";
     const QString PackageModel = "Package Model as .fst...";
     const QString Pair = "Pair";
-    const QString PhysicsShowHulls = "Draw Collision Shapes";
     const QString PhysicsShowOwned = "Highlight Simulation Ownership";
     const QString VerboseLogging = "Verbose Logging";
     const QString PhysicsShowBulletWireframe = "Show Bullet Collision";

interface/src/SecondaryCamera.cpp

@@ -11,25 +11,16 @@
 
 #include "SecondaryCamera.h"
 
+#include <RenderDeferredTask.h>
+#include <RenderForwardTask.h>
+
 #include <glm/gtx/transform.hpp>
 #include <gpu/Context.h>
-#include <TextureCache.h>
 
 #include "Application.h"
 
 using RenderArgsPointer = std::shared_ptr<RenderArgs>;
 
-void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred) {    
-    task.addJob<RenderShadowTask>("RenderShadowTask", cullFunctor, render::ItemKey::TAG_BITS_1, render::ItemKey::TAG_BITS_1);
-    const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor, render::ItemKey::TAG_BITS_1, render::ItemKey::TAG_BITS_1);
-    assert(items.canCast<RenderFetchCullSortTask::Output>());
-    if (!isDeferred) {
-        task.addJob<RenderForwardTask>("Forward", items);
-    } else {
-        task.addJob<RenderDeferredTask>("RenderDeferredTask", items);
-    }
-}
-
 class SecondaryCameraJob {  // Changes renderContext for our framebuffer and view.
 public:
     using Config = SecondaryCameraJobConfig;
@@ -213,10 +204,10 @@ void SecondaryCameraRenderTask::build(JobModel& task, const render::Varying& inp
     const auto cachedArg = task.addJob<SecondaryCameraJob>("SecondaryCamera");
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor, render::ItemKey::TAG_BITS_1, render::ItemKey::TAG_BITS_1);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
-    if (!isDeferred) {
-        task.addJob<RenderForwardTask>("Forward", items);
+    if (isDeferred) {
+        task.addJob<RenderDeferredTask>("RenderDeferredTask", items, false);
     } else {
-        task.addJob<RenderDeferredTask>("RenderDeferredTask", items);
+        task.addJob<RenderForwardTask>("Forward", items);
     }
     task.addJob<EndSecondaryCameraFrame>("EndSecondaryCamera", cachedArg);
 }

interface/src/SecondaryCamera.h

@@ -12,23 +12,11 @@
 #pragma once
 #ifndef hifi_SecondaryCamera_h
 #define hifi_SecondaryCamera_h
-    
-#include <RenderShadowTask.h>
+
 #include <render/RenderFetchCullSortTask.h>
-#include <RenderDeferredTask.h>
-#include <RenderForwardTask.h>
 #include <TextureCache.h>
 #include <ViewFrustum.h>
 
-class MainRenderTask {
-public:
-    using JobModel = render::Task::Model<MainRenderTask>;
-
-    MainRenderTask() {}
-
-    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred = true);
-};
-
 class SecondaryCameraJobConfig : public render::Task::Config { // Exposes secondary camera parameters to JavaScript.
     Q_OBJECT
     Q_PROPERTY(QUuid attachedEntityId MEMBER attachedEntityId NOTIFY dirty)  // entity whose properties define camera position and orientation

interface/src/avatar/AvatarActionHold.cpp

@@ -440,8 +440,8 @@ QVariantMap AvatarActionHold::getArguments() {
     QVariantMap arguments = ObjectDynamic::getArguments();
     withReadLock([&]{
         arguments["holderID"] = _holderID;
-        arguments["relativePosition"] = glmToQMap(_relativePosition);
-        arguments["relativeRotation"] = glmToQMap(_relativeRotation);
+        arguments["relativePosition"] = vec3ToQMap(_relativePosition);
+        arguments["relativeRotation"] = quatToQMap(_relativeRotation);
         arguments["timeScale"] = _linearTimeScale;
         arguments["hand"] = _hand;
         arguments["kinematic"] = _kinematic;

interface/src/avatar/AvatarManager.cpp

@@ -36,13 +36,13 @@
 #include <SettingHandle.h>
 #include <UsersScriptingInterface.h>
 #include <UUID.h>
-#include <avatars-renderer/OtherAvatar.h>
 #include <shared/ConicalViewFrustum.h>
 
 #include "Application.h"
 #include "InterfaceLogging.h"
 #include "Menu.h"
 #include "MyAvatar.h"
+#include "OtherAvatar.h"
 #include "SceneScriptingInterface.h"
 
 // 50 times per second - target is 45hz, but this helps account for any small deviations
@@ -186,11 +186,21 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
     uint64_t updateExpiry = startTime + UPDATE_BUDGET;
     int numAvatarsUpdated = 0;
     int numAVatarsNotUpdated = 0;
+    bool physicsEnabled = qApp->isPhysicsEnabled();
 
     render::Transaction transaction;
     while (!sortedAvatars.empty()) {
         const SortableAvatar& sortData = sortedAvatars.top();
         const auto avatar = std::static_pointer_cast<Avatar>(sortData.getAvatar());
+        const auto otherAvatar = std::static_pointer_cast<OtherAvatar>(sortData.getAvatar());
+
+        // if the geometry is loaded then turn off the orb
+        if (avatar->getSkeletonModel()->isLoaded()) {
+            // remove the orb if it is there
+            otherAvatar->removeOrb();
+        } else {
+            otherAvatar->updateOrbPosition();
+        }
 
         bool ignoring = DependencyManager::get<NodeList>()->isPersonalMutingNode(avatar->getID());
         if (ignoring) {
@@ -202,7 +212,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
         if (_shouldRender) {
             avatar->ensureInScene(avatar, qApp->getMain3DScene());
         }
-        if (!avatar->isInPhysicsSimulation()) {
+        if (physicsEnabled && !avatar->isInPhysicsSimulation()) {
             ShapeInfo shapeInfo;
             avatar->computeShapeInfo(shapeInfo);
             btCollisionShape* shape = const_cast<btCollisionShape*>(ObjectMotionState::getShapeManager()->getShape(shapeInfo));

interface/src/avatar/AvatarMotionState.cpp

@@ -21,6 +21,17 @@ AvatarMotionState::AvatarMotionState(AvatarSharedPointer avatar, const btCollisi
     _type = MOTIONSTATE_TYPE_AVATAR;
 }
 
+void AvatarMotionState::handleEasyChanges(uint32_t& flags) {
+    ObjectMotionState::handleEasyChanges(flags);
+    if (flags & Simulation::DIRTY_PHYSICS_ACTIVATION && !_body->isActive()) {
+        _body->activate();
+    }
+}
+
+bool AvatarMotionState::handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine* engine) {
+    return ObjectMotionState::handleHardAndEasyChanges(flags, engine);
+}
+
 AvatarMotionState::~AvatarMotionState() {
     assert(_avatar);
     _avatar = nullptr;
@@ -46,6 +57,9 @@ PhysicsMotionType AvatarMotionState::computePhysicsMotionType() const {
 const btCollisionShape* AvatarMotionState::computeNewShape() {
     ShapeInfo shapeInfo;
     std::static_pointer_cast<Avatar>(_avatar)->computeShapeInfo(shapeInfo);
+    glm::vec3 halfExtents = shapeInfo.getHalfExtents();
+    halfExtents.y = 0.0f;
+    _diameter = 2.0f * glm::length(halfExtents);
     return getShapeManager()->getShape(shapeInfo);
 }
 
@@ -60,25 +74,31 @@ void AvatarMotionState::getWorldTransform(btTransform& worldTrans) const {
     worldTrans.setRotation(glmToBullet(getObjectRotation()));
     if (_body) {
         _body->setLinearVelocity(glmToBullet(getObjectLinearVelocity()));
-        _body->setAngularVelocity(glmToBullet(getObjectLinearVelocity()));
+        _body->setAngularVelocity(glmToBullet(getObjectAngularVelocity()));
     }
 }
 
 // virtual
 void AvatarMotionState::setWorldTransform(const btTransform& worldTrans) {
-    // HACK: The PhysicsEngine does not actually move OTHER avatars -- instead it slaves their local RigidBody to the transform
-    // as specified by a remote simulation.  However, to give the remote simulation time to respond to our own objects we tie
-    // the other avatar's body to its true position with a simple spring. This is a HACK that will have to be improved later.
     const float SPRING_TIMESCALE = 0.5f;
     float tau = PHYSICS_ENGINE_FIXED_SUBSTEP / SPRING_TIMESCALE;
     btVector3 currentPosition = worldTrans.getOrigin();
-    btVector3 targetPosition = glmToBullet(getObjectPosition());
-    btTransform newTransform;
-    newTransform.setOrigin((1.0f - tau) * currentPosition + tau * targetPosition);
-    newTransform.setRotation(glmToBullet(getObjectRotation()));
-    _body->setWorldTransform(newTransform);
-    _body->setLinearVelocity(glmToBullet(getObjectLinearVelocity()));
-    _body->setAngularVelocity(glmToBullet(getObjectLinearVelocity()));
+    btVector3 offsetToTarget = glmToBullet(getObjectPosition()) - currentPosition;
+    float distance = offsetToTarget.length();
+    if ((1.0f - tau) * distance > _diameter) {
+        // the avatar body is far from its target --> slam position
+        btTransform newTransform;
+        newTransform.setOrigin(currentPosition + offsetToTarget);
+        newTransform.setRotation(glmToBullet(getObjectRotation()));
+        _body->setWorldTransform(newTransform);
+        _body->setLinearVelocity(glmToBullet(getObjectLinearVelocity()));
+        _body->setAngularVelocity(glmToBullet(getObjectAngularVelocity()));
+    } else {
+        // the avatar body is near its target --> slam velocity
+        btVector3 velocity = glmToBullet(getObjectLinearVelocity()) + (1.0f / SPRING_TIMESCALE) * offsetToTarget;
+        _body->setLinearVelocity(velocity);
+        _body->setAngularVelocity(glmToBullet(getObjectAngularVelocity()));
+    }
 }
 
 // These pure virtual methods must be implemented for each MotionState type
@@ -134,6 +154,10 @@ const QUuid AvatarMotionState::getObjectID() const {
     return _avatar->getSessionUUID();
 }
 
+QString AvatarMotionState::getName() const {
+    return _avatar->getName();
+}
+
 // virtual
 QUuid AvatarMotionState::getSimulatorID() const {
     return _avatar->getSessionUUID();
@@ -145,3 +169,8 @@ void AvatarMotionState::computeCollisionGroupAndMask(int32_t& group, int32_t& ma
     mask = Physics::getDefaultCollisionMask(group);
 }
 
+// virtual
+float AvatarMotionState::getMass() const {
+    return std::static_pointer_cast<Avatar>(_avatar)->computeMass();
+}
+

interface/src/avatar/AvatarMotionState.h

@@ -23,6 +23,9 @@ class AvatarMotionState : public ObjectMotionState {
 public:
     AvatarMotionState(AvatarSharedPointer avatar, const btCollisionShape* shape);
 
+    virtual void handleEasyChanges(uint32_t& flags) override;
+    virtual bool handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine* engine) override;
+
     virtual PhysicsMotionType getMotionType() const override { return _motionType; }
 
     virtual uint32_t getIncomingDirtyFlags() override;
@@ -56,6 +59,7 @@ public:
 
     virtual const QUuid getObjectID() const override;
 
+    virtual QString getName() const override;
     virtual QUuid getSimulatorID() const override;
 
     void setBoundingBox(const glm::vec3& corner, const glm::vec3& diagonal);
@@ -64,6 +68,8 @@ public:
 
     virtual void computeCollisionGroupAndMask(int32_t& group, int32_t& mask) const override;
 
+    virtual float getMass() const override;
+
     friend class AvatarManager;
     friend class Avatar;
 
@@ -76,6 +82,7 @@ protected:
     virtual const btCollisionShape* computeNewShape() override;
 
     AvatarSharedPointer _avatar;
+    float _diameter { 0.0f };
 
     uint32_t _dirtyFlags;
 };

interface/src/avatar/MyAvatar.cpp

@@ -121,6 +121,7 @@ MyAvatar::MyAvatar(QThread* thread) :
     _headData = new MyHead(this);
 
     _skeletonModel = std::make_shared<MySkeletonModel>(this, nullptr);
+    _skeletonModel->setLoadingPriority(MYAVATAR_LOADING_PRIORITY);
     connect(_skeletonModel.get(), &Model::setURLFinished, this, &Avatar::setModelURLFinished);
     connect(_skeletonModel.get(), &Model::setURLFinished, this, [this](bool success) {
         if (success) {
@@ -531,10 +532,14 @@ void MyAvatar::forgetChild(SpatiallyNestablePointer newChild) const {
     SpatiallyNestable::forgetChild(newChild);
 }
 
-void MyAvatar::updateChildCauterization(SpatiallyNestablePointer object) {
+void MyAvatar::recalculateChildCauterization() const {
+    _cauterizationNeedsUpdate = true;
+}
+
+void MyAvatar::updateChildCauterization(SpatiallyNestablePointer object, bool cauterize) {
     if (object->getNestableType() == NestableType::Entity) {
         EntityItemPointer entity = std::static_pointer_cast<EntityItem>(object);
-        entity->setCauterized(!_prevShouldDrawHead);
+        entity->setCauterized(cauterize);
     }
 }
 
@@ -544,17 +549,42 @@ void MyAvatar::simulate(float deltaTime) {
     animateScaleChanges(deltaTime);
 
     if (_cauterizationNeedsUpdate) {
-        const std::unordered_set<int>& headBoneSet = _skeletonModel->getCauterizeBoneSet();
+        _cauterizationNeedsUpdate = false;
+
+        // Redisplay cauterized entities that are no longer children of the avatar.
+        auto cauterizedChild = _cauterizedChildrenOfHead.begin();
+        if (cauterizedChild != _cauterizedChildrenOfHead.end()) {
+            auto children = getChildren();
+            while (cauterizedChild != _cauterizedChildrenOfHead.end()) {
+                if (!children.contains(*cauterizedChild)) {
+                    updateChildCauterization(*cauterizedChild, false);
+                    cauterizedChild = _cauterizedChildrenOfHead.erase(cauterizedChild);
+                } else {
+                    ++cauterizedChild;
+                }
+            }
+        }
+
+        // Update cauterization of entities that are children of the avatar.
+        auto headBoneSet = _skeletonModel->getCauterizeBoneSet();
         forEachChild([&](SpatiallyNestablePointer object) {
             bool isChildOfHead = headBoneSet.find(object->getParentJointIndex()) != headBoneSet.end();
             if (isChildOfHead) {
-                updateChildCauterization(object);
+                // Cauterize or display children of head per head drawing state.
+                updateChildCauterization(object, !_prevShouldDrawHead);
                 object->forEachDescendant([&](SpatiallyNestablePointer descendant) {
-                    updateChildCauterization(descendant);
+                    updateChildCauterization(descendant, !_prevShouldDrawHead);
                 });
+                _cauterizedChildrenOfHead.insert(object);
+            } else if (_cauterizedChildrenOfHead.find(object) != _cauterizedChildrenOfHead.end()) {
+                // Redisplay cauterized children that are not longer children of the head.
+                updateChildCauterization(object, false);
+                object->forEachDescendant([&](SpatiallyNestablePointer descendant) {
+                    updateChildCauterization(descendant, false);
+                });
+                _cauterizedChildrenOfHead.erase(object);
             }
         });
-        _cauterizationNeedsUpdate = false;
     }
 
     {
@@ -684,7 +714,8 @@ void MyAvatar::simulate(float deltaTime) {
                 entityTree->recurseTreeWithOperator(&moveOperator);
             }
         });
-        _characterController.setFlyingAllowed(zoneAllowsFlying && _enableFlying);
+        bool isPhysicsEnabled = qApp->isPhysicsEnabled();
+        _characterController.setFlyingAllowed(zoneAllowsFlying && (_enableFlying || !isPhysicsEnabled));
         _characterController.setCollisionlessAllowed(collisionlessAllowed);
     }
 
@@ -1067,8 +1098,8 @@ void MyAvatar::saveData() {
     settings.setValue("displayName", _displayName);
     settings.setValue("collisionSoundURL", _collisionSoundURL);
     settings.setValue("useSnapTurn", _useSnapTurn);
-    settings.setValue("clearOverlayWhenMoving", _clearOverlayWhenMoving);
     settings.setValue("userHeight", getUserHeight());
+    settings.setValue("enabledFlying", getFlyingEnabled());
 
     settings.endGroup();
 }
@@ -1218,11 +1249,10 @@ void MyAvatar::loadData() {
         settings.remove("avatarEntityData");
     }
     setAvatarEntityDataChanged(true);
-
+    setFlyingEnabled(settings.value("enabledFlying").toBool());
     setDisplayName(settings.value("displayName").toString());
     setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
     setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());
-    setClearOverlayWhenMoving(settings.value("clearOverlayWhenMoving", _clearOverlayWhenMoving).toBool());
     setDominantHand(settings.value("dominantHand", _dominantHand).toString().toLower());
     setUserHeight(settings.value("userHeight", DEFAULT_AVATAR_HEIGHT).toDouble());
     settings.endGroup();
@@ -3318,7 +3348,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
         if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
             activate(Rotation);
         }
-        if (!isActive(Horizontal) && shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix)) {
+        if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
             activate(Horizontal);
         }
         if (!isActive(Vertical) && (shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {

interface/src/avatar/MyAvatar.h

@@ -250,7 +250,7 @@ public:
     Q_ENUM(DriveKeys)
 
     explicit MyAvatar(QThread* thread);
-    ~MyAvatar();
+    virtual ~MyAvatar();
 
     void instantiableAvatar() override {};
     void registerMetaTypes(ScriptEnginePointer engine);
@@ -469,16 +469,6 @@ public:
      * @param {boolean} on
      */
     Q_INVOKABLE void setSnapTurn(bool on) { _useSnapTurn = on; }
-    /**jsdoc
-     * @function MyAvatar.getClearOverlayWhenMoving
-     * @returns {boolean} 
-     */
-    Q_INVOKABLE bool getClearOverlayWhenMoving() const { return _clearOverlayWhenMoving; }
-    /**jsdoc
-     * @function MyAvatar.setClearOverlayWhenMoving
-     * @param {boolean} on
-     */
-    Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
 
     /**jsdoc
@@ -1374,6 +1364,7 @@ private slots:
 protected:
     virtual void beParentOfChild(SpatiallyNestablePointer newChild) const override;
     virtual void forgetChild(SpatiallyNestablePointer newChild) const override;
+    virtual void recalculateChildCauterization() const override;
 
 private:
 
@@ -1433,7 +1424,7 @@ private:
     std::array<float, MAX_DRIVE_KEYS> _driveKeys;
     std::bitset<MAX_DRIVE_KEYS> _disabledDriveKeys;
 
-    bool _enableFlying { true };
+    bool _enableFlying { false };
     bool _wasPushing { false };
     bool _isPushing { false };
     bool _isBeingPushed { false };
@@ -1495,7 +1486,6 @@ private:
     ThreadSafeValueCache<QUrl> _prefOverrideAnimGraphUrl;
     QUrl _fstAnimGraphOverrideUrl;
     bool _useSnapTurn { true };
-    bool _clearOverlayWhenMoving { true };
     QString _dominantHand { DOMINANT_RIGHT_HAND };
 
     const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // degrees
@@ -1566,6 +1556,7 @@ private:
     glm::quat _goToOrientation;
 
     std::unordered_set<int> _headBoneSet;
+    std::unordered_set<SpatiallyNestablePointer> _cauterizedChildrenOfHead;
     bool _prevShouldDrawHead;
     bool _rigEnabled { true };
 
@@ -1621,7 +1612,7 @@ private:
     // height of user in sensor space, when standing erect.
     ThreadSafeValueCache<float> _userHeight { DEFAULT_AVATAR_HEIGHT };
 
-    void updateChildCauterization(SpatiallyNestablePointer object);
+    void updateChildCauterization(SpatiallyNestablePointer object, bool cauterize);
 
     // max unscaled forward movement speed
     ThreadSafeValueCache<float> _walkSpeed { DEFAULT_AVATAR_MAX_WALKING_SPEED };

interface/src/avatar/MyCharacterController.cpp

@@ -108,12 +108,15 @@ bool MyCharacterController::testRayShotgun(const glm::vec3& position, const glm:
     btScalar lengthAxis = axis.length();
     if (lengthAxis > FLT_EPSILON) {
         // we're walking sideways
-        btScalar angle = acosf(lengthAxis / adjustedDirection.length());
-        if (rayDirection.dot(forward) < 0.0f) {
-            angle = PI - angle;
+        btScalar cosAngle = lengthAxis / adjustedDirection.length();
+        if (cosAngle < 1.0f) {
+            btScalar angle = acosf(cosAngle);
+            if (rayDirection.dot(forward) < 0.0f) {
+                angle = PI - angle;
+            }
+            axis /= lengthAxis;
+            rotation = btMatrix3x3(btQuaternion(axis, angle)) * rotation;
         }
-        axis /= lengthAxis;
-        rotation = btMatrix3x3(btQuaternion(axis, angle)) * rotation;
     } else if (rayDirection.dot(forward) < 0.0f) {
         // we're walking backwards
         rotation = btMatrix3x3(btQuaternion(_currentUp, PI)) * rotation;

interface/src/avatar/MySkeletonModel.cpp

@@ -46,7 +46,7 @@ static AnimPose computeHipsInSensorFrame(MyAvatar* myAvatar, bool isFlying) {
     }
 
     glm::mat4 hipsMat;
-    if (myAvatar->getCenterOfGravityModelEnabled()) {
+    if (myAvatar->getCenterOfGravityModelEnabled() && !isFlying) {
         // then we use center of gravity model
         hipsMat = myAvatar->deriveBodyUsingCgModel();
     } else {

interface/src/avatar/OtherAvatar.cpp

@@ -0,0 +1,60 @@
+//
+//  Created by Bradley Austin Davis on 2017/04/27
+//  Copyright 2013-2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "OtherAvatar.h"
+#include "Application.h"
+
+OtherAvatar::OtherAvatar(QThread* thread) : Avatar(thread) {
+    // give the pointer to our head to inherited _headData variable from AvatarData
+    _headData = new Head(this);
+    _skeletonModel = std::make_shared<SkeletonModel>(this, nullptr);
+    _skeletonModel->setLoadingPriority(OTHERAVATAR_LOADING_PRIORITY);
+    connect(_skeletonModel.get(), &Model::setURLFinished, this, &Avatar::setModelURLFinished);
+    connect(_skeletonModel.get(), &Model::rigReady, this, &Avatar::rigReady);
+    connect(_skeletonModel.get(), &Model::rigReset, this, &Avatar::rigReset);
+
+    // add the purple orb
+    createOrb();
+}
+
+OtherAvatar::~OtherAvatar() {
+    removeOrb();
+}
+
+void OtherAvatar::removeOrb() {
+    if (qApp->getOverlays().isAddedOverlay(_otherAvatarOrbMeshPlaceholderID)) {
+        qApp->getOverlays().deleteOverlay(_otherAvatarOrbMeshPlaceholderID);
+    }
+}
+
+void OtherAvatar::updateOrbPosition() {
+    if (_otherAvatarOrbMeshPlaceholder != nullptr) {
+        _otherAvatarOrbMeshPlaceholder->setWorldPosition(getHead()->getPosition());
+    }
+}
+
+void OtherAvatar::createOrb() {
+    if (_otherAvatarOrbMeshPlaceholderID == UNKNOWN_OVERLAY_ID ||
+        !qApp->getOverlays().isAddedOverlay(_otherAvatarOrbMeshPlaceholderID)) {
+        _otherAvatarOrbMeshPlaceholder = std::make_shared<Sphere3DOverlay>();
+        _otherAvatarOrbMeshPlaceholder->setAlpha(1.0f);
+        _otherAvatarOrbMeshPlaceholder->setColor({ 0xFF, 0x00, 0xFF });
+        _otherAvatarOrbMeshPlaceholder->setIsSolid(false);
+        _otherAvatarOrbMeshPlaceholder->setPulseMin(0.5);
+        _otherAvatarOrbMeshPlaceholder->setPulseMax(1.0);
+        _otherAvatarOrbMeshPlaceholder->setColorPulse(1.0);
+        _otherAvatarOrbMeshPlaceholder->setIgnoreRayIntersection(true);
+        _otherAvatarOrbMeshPlaceholder->setDrawInFront(false);
+        _otherAvatarOrbMeshPlaceholderID = qApp->getOverlays().addOverlay(_otherAvatarOrbMeshPlaceholder);
+        // Position focus
+        _otherAvatarOrbMeshPlaceholder->setWorldOrientation(glm::quat(0.0f, 0.0f, 0.0f, 1.0));
+        _otherAvatarOrbMeshPlaceholder->setWorldPosition(getHead()->getPosition());
+        _otherAvatarOrbMeshPlaceholder->setDimensions(glm::vec3(0.5f, 0.5f, 0.5f));
+        _otherAvatarOrbMeshPlaceholder->setVisible(true);
+    }
+}

interface/src/avatar/OtherAvatar.h

@@ -0,0 +1,32 @@
+//
+//  Created by Bradley Austin Davis on 2017/04/27
+//  Copyright 2013-2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_OtherAvatar_h
+#define hifi_OtherAvatar_h
+
+#include <avatars-renderer/Avatar.h>
+#include "ui/overlays/Overlays.h"
+#include "ui/overlays/Sphere3DOverlay.h"
+#include "InterfaceLogging.h"
+
+class OtherAvatar : public Avatar {
+public:
+    explicit OtherAvatar(QThread* thread);
+    virtual ~OtherAvatar();
+
+    virtual void instantiableAvatar() override { };
+    virtual void createOrb() override;
+    void updateOrbPosition();
+    void removeOrb();
+
+protected:
+    std::shared_ptr<Sphere3DOverlay> _otherAvatarOrbMeshPlaceholder { nullptr };
+    OverlayID _otherAvatarOrbMeshPlaceholderID { UNKNOWN_OVERLAY_ID };
+};
+
+#endif  // hifi_OtherAvatar_h

interface/src/commerce/Ledger.cpp

@@ -28,15 +28,15 @@
 // account synthesizes a result {status: 'success', data: {keyStatus: "preexisting"|"conflicting"|"ok"}}
 
 
-QJsonObject Ledger::apiResponse(const QString& label, QNetworkReply& reply) {
-    QByteArray response = reply.readAll();
+QJsonObject Ledger::apiResponse(const QString& label, QNetworkReply* reply) {
+    QByteArray response = reply->readAll();
     QJsonObject data = QJsonDocument::fromJson(response).object();
     qInfo(commerce) << label << "response" << QJsonDocument(data).toJson(QJsonDocument::Compact);
     return data;
 }
 // Non-200 responses are not json:
-QJsonObject Ledger::failResponse(const QString& label, QNetworkReply& reply) {
-    QString response = reply.readAll();
+QJsonObject Ledger::failResponse(const QString& label, QNetworkReply* reply) {
+    QString response = reply->readAll();
     qWarning(commerce) << "FAILED" << label << response;
 
     // tempResult will be NULL if the response isn't valid JSON.
@@ -52,8 +52,8 @@ QJsonObject Ledger::failResponse(const QString& label, QNetworkReply& reply) {
         return tempResult.object();
     }
 }
-#define ApiHandler(NAME) void Ledger::NAME##Success(QNetworkReply& reply) { emit NAME##Result(apiResponse(#NAME, reply)); }
-#define FailHandler(NAME) void Ledger::NAME##Failure(QNetworkReply& reply) { emit NAME##Result(failResponse(#NAME, reply)); }
+#define ApiHandler(NAME) void Ledger::NAME##Success(QNetworkReply* reply) { emit NAME##Result(apiResponse(#NAME, reply)); }
+#define FailHandler(NAME) void Ledger::NAME##Failure(QNetworkReply* reply) { emit NAME##Result(failResponse(#NAME, reply)); }
 #define Handler(NAME) ApiHandler(NAME) FailHandler(NAME)
 Handler(buy)
 Handler(receiveAt)
@@ -68,7 +68,7 @@ Handler(updateItem)
 void Ledger::send(const QString& endpoint, const QString& success, const QString& fail, QNetworkAccessManager::Operation method, AccountManagerAuth::Type authType, QJsonObject request) {
     auto accountManager = DependencyManager::get<AccountManager>();
     const QString URL = "/api/v1/commerce/";
-    JSONCallbackParameters callbackParams(this, success, this, fail);
+    JSONCallbackParameters callbackParams(this, success, fail);
     qCInfo(commerce) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
     accountManager->sendRequest(URL + endpoint,
         authType,
@@ -223,12 +223,12 @@ QString transactionString(const QJsonObject& valueObject) {
 }
 
 static const QString MARKETPLACE_ITEMS_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/marketplace/items/";
-void Ledger::historySuccess(QNetworkReply& reply) {
+void Ledger::historySuccess(QNetworkReply* reply) {
     // here we send a historyResult with some extra stuff in it
     // Namely, the styled text we'd like to show.  The issue is the
     // QML cannot do that easily since it doesn't know what the wallet
     // public key(s) are.  Let's keep it that way
-    QByteArray response = reply.readAll();
+    QByteArray response = reply->readAll();
     QJsonObject data = QJsonDocument::fromJson(response).object();
     qInfo(commerce) << "history" << "response" << QJsonDocument(data).toJson(QJsonDocument::Compact);
 
@@ -262,7 +262,7 @@ void Ledger::historySuccess(QNetworkReply& reply) {
     emit historyResult(newData);
 }
 
-void Ledger::historyFailure(QNetworkReply& reply) {
+void Ledger::historyFailure(QNetworkReply* reply) {
     failResponse("history", reply);
 }
 
@@ -273,10 +273,10 @@ void Ledger::history(const QStringList& keys, const int& pageNumber, const int&
     keysQuery("history", "historySuccess", "historyFailure", params);
 }
 
-void Ledger::accountSuccess(QNetworkReply& reply) {
+void Ledger::accountSuccess(QNetworkReply* reply) {
     // lets set the appropriate stuff in the wallet now
     auto wallet = DependencyManager::get<Wallet>();
-    QByteArray response = reply.readAll();
+    QByteArray response = reply->readAll();
     QJsonObject data = QJsonDocument::fromJson(response).object()["data"].toObject();
 
     auto salt = QByteArray::fromBase64(data["salt"].toString().toUtf8());
@@ -312,7 +312,7 @@ void Ledger::accountSuccess(QNetworkReply& reply) {
     emit accountResult(responseData);
 }
 
-void Ledger::accountFailure(QNetworkReply& reply) {
+void Ledger::accountFailure(QNetworkReply* reply) {
     failResponse("account", reply);
 }
 void Ledger::account() {
@@ -320,8 +320,8 @@ void Ledger::account() {
 }
 
 // The api/failResponse is called just for the side effect of logging.
-void Ledger::updateLocationSuccess(QNetworkReply& reply) { apiResponse("updateLocation", reply); }
-void Ledger::updateLocationFailure(QNetworkReply& reply) { failResponse("updateLocation", reply); }
+void Ledger::updateLocationSuccess(QNetworkReply* reply) { apiResponse("updateLocation", reply); }
+void Ledger::updateLocationFailure(QNetworkReply* reply) { failResponse("updateLocation", reply); }
 void Ledger::updateLocation(const QString& asset_id, const QString& location, const bool& alsoUpdateSiblings, const bool controlledFailure) {
     auto wallet = DependencyManager::get<Wallet>();
     auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
@@ -349,11 +349,11 @@ void Ledger::updateLocation(const QString& asset_id, const QString& location, co
     }
 }
 
-void Ledger::certificateInfoSuccess(QNetworkReply& reply) {
+void Ledger::certificateInfoSuccess(QNetworkReply* reply) {
     auto wallet = DependencyManager::get<Wallet>();
     auto accountManager = DependencyManager::get<AccountManager>();
 
-    QByteArray response = reply.readAll();
+    QByteArray response = reply->readAll();
     QJsonObject replyObject = QJsonDocument::fromJson(response).object();
 
     QStringList keys = wallet->listPublicKeys();
@@ -366,7 +366,7 @@ void Ledger::certificateInfoSuccess(QNetworkReply& reply) {
     qInfo(commerce) << "certificateInfo" << "response" << QJsonDocument(replyObject).toJson(QJsonDocument::Compact);
     emit certificateInfoResult(replyObject);
 }
-void Ledger::certificateInfoFailure(QNetworkReply& reply) {
+void Ledger::certificateInfoFailure(QNetworkReply* reply) {
     emit certificateInfoResult(failResponse("certificateInfo", reply));
 }
 void Ledger::certificateInfo(const QString& certificateId) {

interface/src/commerce/Ledger.h

@@ -65,36 +65,36 @@ signals:
     void updateCertificateStatus(const QString& certID, uint certStatus);
 
 public slots:
-    void buySuccess(QNetworkReply& reply);
-    void buyFailure(QNetworkReply& reply);
-    void receiveAtSuccess(QNetworkReply& reply);
-    void receiveAtFailure(QNetworkReply& reply);
-    void balanceSuccess(QNetworkReply& reply);
-    void balanceFailure(QNetworkReply& reply);
-    void inventorySuccess(QNetworkReply& reply);
-    void inventoryFailure(QNetworkReply& reply);
-    void historySuccess(QNetworkReply& reply);
-    void historyFailure(QNetworkReply& reply);
-    void accountSuccess(QNetworkReply& reply);
-    void accountFailure(QNetworkReply& reply);
-    void updateLocationSuccess(QNetworkReply& reply);
-    void updateLocationFailure(QNetworkReply& reply);
-    void certificateInfoSuccess(QNetworkReply& reply);
-    void certificateInfoFailure(QNetworkReply& reply);
-    void transferAssetToNodeSuccess(QNetworkReply& reply);
-    void transferAssetToNodeFailure(QNetworkReply& reply);
-    void transferAssetToUsernameSuccess(QNetworkReply& reply);
-    void transferAssetToUsernameFailure(QNetworkReply& reply);
-    void alreadyOwnedSuccess(QNetworkReply& reply);
-    void alreadyOwnedFailure(QNetworkReply& reply);
-    void availableUpdatesSuccess(QNetworkReply& reply);
-    void availableUpdatesFailure(QNetworkReply& reply);
-    void updateItemSuccess(QNetworkReply& reply);
-    void updateItemFailure(QNetworkReply& reply);
+    void buySuccess(QNetworkReply* reply);
+    void buyFailure(QNetworkReply* reply);
+    void receiveAtSuccess(QNetworkReply* reply);
+    void receiveAtFailure(QNetworkReply* reply);
+    void balanceSuccess(QNetworkReply* reply);
+    void balanceFailure(QNetworkReply* reply);
+    void inventorySuccess(QNetworkReply* reply);
+    void inventoryFailure(QNetworkReply* reply);
+    void historySuccess(QNetworkReply* reply);
+    void historyFailure(QNetworkReply* reply);
+    void accountSuccess(QNetworkReply* reply);
+    void accountFailure(QNetworkReply* reply);
+    void updateLocationSuccess(QNetworkReply* reply);
+    void updateLocationFailure(QNetworkReply* reply);
+    void certificateInfoSuccess(QNetworkReply* reply);
+    void certificateInfoFailure(QNetworkReply* reply);
+    void transferAssetToNodeSuccess(QNetworkReply* reply);
+    void transferAssetToNodeFailure(QNetworkReply* reply);
+    void transferAssetToUsernameSuccess(QNetworkReply* reply);
+    void transferAssetToUsernameFailure(QNetworkReply* reply);
+    void alreadyOwnedSuccess(QNetworkReply* reply);
+    void alreadyOwnedFailure(QNetworkReply* reply);
+    void availableUpdatesSuccess(QNetworkReply* reply);
+    void availableUpdatesFailure(QNetworkReply* reply);
+    void updateItemSuccess(QNetworkReply* reply);
+    void updateItemFailure(QNetworkReply* reply);
 
 private:
-    QJsonObject apiResponse(const QString& label, QNetworkReply& reply);
-    QJsonObject failResponse(const QString& label, QNetworkReply& reply);
+    QJsonObject apiResponse(const QString& label, QNetworkReply* reply);
+    QJsonObject failResponse(const QString& label, QNetworkReply* reply);
     void send(const QString& endpoint, const QString& success, const QString& fail, QNetworkAccessManager::Operation method, AccountManagerAuth::Type authType, QJsonObject request);
     void keysQuery(const QString& endpoint, const QString& success, const QString& fail, QJsonObject& extraRequestParams);
     void keysQuery(const QString& endpoint, const QString& success, const QString& fail);

interface/src/commerce/Wallet.cpp

@@ -127,31 +127,40 @@ EC_KEY* readKeys(const char* filename) {
 bool Wallet::writeBackupInstructions() {
     QString inputFilename(PathUtils::resourcesPath() + "html/commerce/backup_instructions.html");
     QString outputFilename = PathUtils::getAppDataFilePath(INSTRUCTIONS_FILE);
+    QFile inputFile(inputFilename);
     QFile outputFile(outputFilename);
     bool retval = false;
 
-    if (QFile::exists(outputFilename) || getKeyFilePath() == "")
+    if (getKeyFilePath() == "")
     {
         return false;
     }
-    QFile::copy(inputFilename, outputFilename);
 
-    if (QFile::exists(outputFilename) && outputFile.open(QIODevice::ReadWrite)) {
+    if (QFile::exists(inputFilename) && inputFile.open(QIODevice::ReadOnly)) {
+        if (outputFile.open(QIODevice::ReadWrite)) {
+            // Read the data from the original file, then close it
+            QByteArray fileData = inputFile.readAll();
+            inputFile.close();
 
-        QByteArray fileData = outputFile.readAll();
-        QString text(fileData);
+            // Translate the data from the original file into a QString
+            QString text(fileData);
 
-        text.replace(QString("HIFIKEY_PATH_REPLACEME"), keyFilePath());
+            // Replace the necessary string
+            text.replace(QString("HIFIKEY_PATH_REPLACEME"), keyFilePath());
 
-        outputFile.seek(0); // go to the beginning of the file
-        outputFile.write(text.toUtf8()); // write the new text back to the file
+            // Write the new text back to the file
+            outputFile.write(text.toUtf8());
 
-        outputFile.close(); // close the file handle.
+            // Close the output file
+            outputFile.close();  
 
-        retval = true;
-        qCDebug(commerce) << "wrote html file successfully";
+            retval = true;
+            qCDebug(commerce) << "wrote html file successfully";
+        } else {
+            qCDebug(commerce) << "failed to open output html file" << outputFilename;
+        }
     } else {
-        qCDebug(commerce) << "failed to open output html file" << outputFilename;
+        qCDebug(commerce) << "failed to open input html file" << inputFilename;
     }
     return retval;
 }

interface/src/main.cpp

@@ -26,7 +26,7 @@
 
 #include "AddressManager.h"
 #include "Application.h"
-#include "Crashpad.h"
+#include "CrashHandler.h"
 #include "InterfaceLogging.h"
 #include "UserActivityLogger.h"
 #include "MainWindow.h"

interface/src/scripting/HMDScriptingInterface.h

@@ -56,7 +56,8 @@ class QScriptEngine;
  * @property {Uuid} tabletID - The UUID of the tablet body model overlay.
  * @property {Uuid} tabletScreenID - The UUID of the tablet's screen overlay.
  * @property {Uuid} homeButtonID - The UUID of the tablet's "home" button overlay.
- * @property {Uuid} homeButtonHighlightID - The UUID of the tablet's "home" button highlight overlay.
+ * @property {Uuid} homeButtonHighlightMaterialID - The UUID of the material entity used to highlight tablet button
+ * @property {Uuid} homeButtonUnhighlightMaterialID - The UUID of the material entity use to unhighlight the entity
  */
 class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Dependency {
     Q_OBJECT
@@ -67,8 +68,9 @@ class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Depen
     Q_PROPERTY(bool tabletContextualMode READ getTabletContextualMode)
     Q_PROPERTY(QUuid tabletID READ getCurrentTabletFrameID WRITE setCurrentTabletFrameID)
     Q_PROPERTY(QUuid homeButtonID READ getCurrentHomeButtonID WRITE setCurrentHomeButtonID)
-    Q_PROPERTY(QUuid homeButtonHighlightID READ getCurrentHomeButtonHightlightID WRITE setCurrentHomeButtonHightlightID)
     Q_PROPERTY(QUuid tabletScreenID READ getCurrentTabletScreenID WRITE setCurrentTabletScreenID)
+    Q_PROPERTY(QUuid homeButtonHighlightMaterialID READ getCurrentHomeButtonHighlightMaterialID WRITE setCurrentHomeButtonHighlightMaterialID)
+    Q_PROPERTY(QUuid homeButtonUnhighlightMaterialID READ getCurrentHomeButtonUnhighlightMaterialID WRITE setCurrentHomeButtonUnhighlightMaterialID)
 
 public:
     
@@ -372,20 +374,24 @@ public:
     void setCurrentHomeButtonID(QUuid homeButtonID) { _homeButtonID = homeButtonID; }
     QUuid getCurrentHomeButtonID() const { return _homeButtonID; }
 
-    void setCurrentHomeButtonHightlightID(QUuid homeButtonHightlightID) { _homeButtonHightlightID = homeButtonHightlightID; }
-    QUuid getCurrentHomeButtonHightlightID() const { return _homeButtonHightlightID; }
-
     void setCurrentTabletScreenID(QUuid tabletID) { _tabletScreenID = tabletID; }
     QUuid getCurrentTabletScreenID() const { return _tabletScreenID; }
 
+    void setCurrentHomeButtonHighlightMaterialID(QUuid homeButtonHighlightMaterialID) { _homeButtonHighlightMaterialID = homeButtonHighlightMaterialID; }
+    QUuid getCurrentHomeButtonHighlightMaterialID() { return _homeButtonHighlightMaterialID; }
+
+    void setCurrentHomeButtonUnhighlightMaterialID(QUuid homeButtonUnhighlightMaterialID) { _homeButtonUnhighlightMaterialID = homeButtonUnhighlightMaterialID; }
+    QUuid getCurrentHomeButtonUnhighlightMaterialID() { return _homeButtonUnhighlightMaterialID; }
+
 private:
     bool _showTablet { false };
     bool _tabletContextualMode { false };
     QUuid _tabletUIID; // this is the entityID of the tablet frame
     QUuid _tabletScreenID; // this is the overlayID which is part of (a child of) the tablet-ui.
     QUuid _homeButtonID;
-    QUuid _homeButtonHightlightID;
     QUuid _tabletEntityID;
+    QUuid _homeButtonHighlightMaterialID;
+    QUuid _homeButtonUnhighlightMaterialID;
 
     // Get the position of the HMD
     glm::vec3 getPosition() const;

interface/src/scripting/LimitlessConnection.cpp

@@ -1,93 +0,0 @@
-#include "LimitlessConnection.h"
-
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <src/InterfaceLogging.h>
-#include <src/ui/AvatarInputs.h>
-#include "LimitlessVoiceRecognitionScriptingInterface.h"
-
-LimitlessConnection::LimitlessConnection() :
-        _streamingAudioForTranscription(false)
-{
-}
-
-void LimitlessConnection::startListening(QString authCode) {
-    _transcribeServerSocket.reset(new QTcpSocket(this));
-    connect(_transcribeServerSocket.get(), &QTcpSocket::readyRead, this,
-            &LimitlessConnection::transcriptionReceived);
-    connect(_transcribeServerSocket.get(), &QTcpSocket::disconnected, this, [this](){stopListening();});
-
-    static const auto host = "gserv_devel.studiolimitless.com";
-    _transcribeServerSocket->connectToHost(host, 1407);
-    _transcribeServerSocket->waitForConnected();
-    QString requestHeader = QString::asprintf("Authorization: %s\r\nfs: %i\r\n",
-                                              authCode.toLocal8Bit().data(), AudioConstants::SAMPLE_RATE);
-    qCDebug(interfaceapp) << "Sending Limitless Audio Stream Request: " << requestHeader;
-    _transcribeServerSocket->write(requestHeader.toLocal8Bit());
-    _transcribeServerSocket->waitForBytesWritten();
-}
-
-void LimitlessConnection::stopListening() {
-    emit onFinishedSpeaking(_currentTranscription);
-    _streamingAudioForTranscription = false;
-    _currentTranscription = "";
-    if (!isConnected())
-        return;
-    _transcribeServerSocket->close();
-    disconnect(_transcribeServerSocket.get(), &QTcpSocket::readyRead, this,
-            &LimitlessConnection::transcriptionReceived);
-    _transcribeServerSocket.release()->deleteLater();
-    disconnect(DependencyManager::get<AudioClient>().data(), &AudioClient::inputReceived, this,
-            &LimitlessConnection::audioInputReceived);
-    qCDebug(interfaceapp) << "Connection to Limitless Voice Server closed.";
-}
-
-void LimitlessConnection::audioInputReceived(const QByteArray& inputSamples) {
-    if (isConnected()) {
-        _transcribeServerSocket->write(inputSamples.data(), inputSamples.size());
-        _transcribeServerSocket->waitForBytesWritten();
-    }
-}
-
-void LimitlessConnection::transcriptionReceived() {
-    while (_transcribeServerSocket && _transcribeServerSocket->bytesAvailable() > 0) {
-        const QByteArray data = _transcribeServerSocket->readAll();
-        _serverDataBuffer.append(data);
-        int begin = _serverDataBuffer.indexOf('<');
-        int end = _serverDataBuffer.indexOf('>');
-        while (begin > -1 && end > -1) {
-            const int len = end - begin;
-            const QByteArray serverMessage = _serverDataBuffer.mid(begin+1, len-1);
-            if (serverMessage.contains("1407")) {
-                qCDebug(interfaceapp) << "Limitless Speech Server denied the request.";
-                // Don't spam the server with further false requests please.
-                DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>()->setListeningToVoice(true);
-                stopListening();
-                return;
-            } else if (serverMessage.contains("1408")) {
-                qCDebug(interfaceapp) << "Limitless Audio request authenticated!";
-                _serverDataBuffer.clear();
-                connect(DependencyManager::get<AudioClient>().data(), &AudioClient::inputReceived, this,
-                        &LimitlessConnection::audioInputReceived);
-                return;
-            }
-            QJsonObject json = QJsonDocument::fromJson(serverMessage.data()).object();
-            _serverDataBuffer.remove(begin, len+1);
-            _currentTranscription = json["alternatives"].toArray()[0].toObject()["transcript"].toString();
-            emit onReceivedTranscription(_currentTranscription);
-            if (json["isFinal"] == true) {
-                qCDebug(interfaceapp) << "Final transcription: " << _currentTranscription;
-                stopListening();
-                return;
-            }
-            begin = _serverDataBuffer.indexOf('<');
-            end = _serverDataBuffer.indexOf('>');
-        }
-    }
-}
-
-bool LimitlessConnection::isConnected() const {
-    return _transcribeServerSocket.get() && _transcribeServerSocket->isWritable()
-    && _transcribeServerSocket->state() != QAbstractSocket::SocketState::UnconnectedState;
-}

interface/src/scripting/LimitlessConnection.h

@@ -1,46 +0,0 @@
-//
-//  SpeechRecognitionScriptingInterface.h
-//  interface/src/scripting
-//
-//  Created by Trevor Berninger on 3/24/17.
-//  Copyright 2017 Limitless ltd.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_LimitlessConnection_h
-#define hifi_LimitlessConnection_h
-
-#include <QtCore/QObject>
-#include <QtCore/QFuture>
-#include <QtNetwork/QTcpSocket>
-
-#include <AudioClient.h>
-
-class LimitlessConnection : public QObject {
-    Q_OBJECT
-public:
-    LimitlessConnection();
-
-    Q_INVOKABLE void startListening(QString authCode);
-    Q_INVOKABLE void stopListening();
-
-    std::atomic<bool> _streamingAudioForTranscription;
-
-signals:
-    void onReceivedTranscription(QString speech);
-    void onFinishedSpeaking(QString speech);
-
-private:
-    void transcriptionReceived();
-    void audioInputReceived(const QByteArray& inputSamples);
-
-    bool isConnected() const;
-
-    std::unique_ptr<QTcpSocket> _transcribeServerSocket;
-    QByteArray _serverDataBuffer;
-    QString _currentTranscription;
-};
-
-#endif //hifi_LimitlessConnection_h

interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp

@@ -1,66 +0,0 @@
-//
-//  SpeechRecognitionScriptingInterface.h
-//  interface/src/scripting
-//
-//  Created by Trevor Berninger on 3/20/17.
-//  Copyright 2017 Limitless ltd.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "LimitlessVoiceRecognitionScriptingInterface.h"
-
-#include <QtConcurrent/QtConcurrentRun>
-
-#include <ThreadHelpers.h>
-
-#include "InterfaceLogging.h"
-#include "ui/AvatarInputs.h"
-
-const float LimitlessVoiceRecognitionScriptingInterface::_audioLevelThreshold = 0.33f;
-const int LimitlessVoiceRecognitionScriptingInterface::_voiceTimeoutDuration = 2000;
-
-LimitlessVoiceRecognitionScriptingInterface::LimitlessVoiceRecognitionScriptingInterface() :
-        _shouldStartListeningForVoice(false)
-{
-    _voiceTimer.setSingleShot(true);
-    connect(&_voiceTimer, &QTimer::timeout, this, &LimitlessVoiceRecognitionScriptingInterface::voiceTimeout);
-    connect(&_connection, &LimitlessConnection::onReceivedTranscription, this, [this](QString transcription){emit onReceivedTranscription(transcription);});
-    connect(&_connection, &LimitlessConnection::onFinishedSpeaking, this, [this](QString transcription){emit onFinishedSpeaking(transcription);});
-    moveToNewNamedThread(&_connection, "Limitless Connection");
-}
-
-void LimitlessVoiceRecognitionScriptingInterface::update() {
-    const float audioLevel = AvatarInputs::getInstance()->loudnessToAudioLevel(DependencyManager::get<AudioClient>()->getAudioAverageInputLoudness());
-
-    if (_shouldStartListeningForVoice) {
-        if (_connection._streamingAudioForTranscription) {
-            if (audioLevel > _audioLevelThreshold) {
-                if (_voiceTimer.isActive()) {
-                    _voiceTimer.stop();
-                }
-            } else if (!_voiceTimer.isActive()){
-                _voiceTimer.start(_voiceTimeoutDuration);
-            }
-        } else if (audioLevel > _audioLevelThreshold) {
-            // to make sure invoke doesn't get called twice before the method actually gets called
-            _connection._streamingAudioForTranscription = true;
-            QMetaObject::invokeMethod(&_connection, "startListening", Q_ARG(QString, authCode));
-        }
-    }
-}
-
-void LimitlessVoiceRecognitionScriptingInterface::setListeningToVoice(bool listening) {
-    _shouldStartListeningForVoice = listening;
-}
-
-void LimitlessVoiceRecognitionScriptingInterface::setAuthKey(QString key) {
-    authCode = key;
-}
-
-void LimitlessVoiceRecognitionScriptingInterface::voiceTimeout() {
-    if (_connection._streamingAudioForTranscription) {
-        QMetaObject::invokeMethod(&_connection, "stopListening");
-    }
-}

interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.h

@@ -1,49 +0,0 @@
-//
-//  SpeechRecognitionScriptingInterface.h
-//  interface/src/scripting
-//
-//  Created by Trevor Berninger on 3/20/17.
-//  Copyright 2017 Limitless ltd.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_SpeechRecognitionScriptingInterface_h
-#define hifi_SpeechRecognitionScriptingInterface_h
-
-#include <AudioClient.h>
-#include <QObject>
-#include <QFuture>
-#include "LimitlessConnection.h"
-
-class LimitlessVoiceRecognitionScriptingInterface : public QObject, public Dependency {
-    Q_OBJECT
-public:
-    LimitlessVoiceRecognitionScriptingInterface();
-
-    void update();
-
-    QString authCode;
-
-public slots:
-    void setListeningToVoice(bool listening);
-    void setAuthKey(QString key);
-
-signals:
-    void onReceivedTranscription(QString speech);
-    void onFinishedSpeaking(QString speech);
-
-private:
-
-    bool _shouldStartListeningForVoice;
-    static const float _audioLevelThreshold;
-    static const int _voiceTimeoutDuration;
-
-    QTimer _voiceTimer;
-    LimitlessConnection _connection;
-
-    void voiceTimeout();
-};
-
-#endif //hifi_SpeechRecognitionScriptingInterface_h

interface/src/scripting/SelectionScriptingInterface.h

@@ -182,7 +182,7 @@ public:
 
     /**jsdoc
     * Get the list of avatars, entities, and overlays stored in a selection list.
-    * @function Selection.getList
+    * @function Selection.getSelectedItemsList
     * @param {string} listName - The name of the selection list.
     * @returns {Selection.SelectedItemsList} The content of a selection list. If the list name doesn't exist, the function 
     *     returns an empty object with no properties.
@@ -257,7 +257,7 @@ public:
     void onSelectedItemsListChanged(const QString& listName);
 
 signals:
-    /**jsoc
+    /**jsdoc
      * Triggered when a list's content changes.
      * @function Selection.selectedItemsListChanged
      * @param {string} listName - The name of the selection list that changed.

interface/src/scripting/SettingsScriptingInterface.cpp

@@ -35,5 +35,8 @@ QVariant SettingsScriptingInterface::getValue(const QString& setting, const QVar
 }
 
 void SettingsScriptingInterface::setValue(const QString& setting, const QVariant& value) {
-    Setting::Handle<QVariant>(setting).set(value);
+    // Make a deep-copy of the string.
+    // Dangling pointers can occur with QStrings that are implicitly shared from a QScriptEngine.
+    QString deepCopy = QString::fromUtf16(setting.utf16());
+    Setting::Handle<QVariant>(deepCopy).set(value);
 }

interface/src/scripting/WindowScriptingInterface.h

@@ -319,6 +319,15 @@ public slots:
      * {@link Window.processingGifStarted|processingGifStarted} and {@link Window.processingGifCompleted|processingGifCompleted}
      * are emitted. The path to store the snapshots and the length of the animated GIF to capture are specified in Settings >
      * General > Snapshots.
+     *
+     * If user has supplied a specific filename for the snapshot:
+     *     If the user's requested filename has a suffix that's contained within SUPPORTED_IMAGE_FORMATS,
+     *         DON'T append ".jpg" to the filename. QT will save the image in the format associated with the
+     *         filename's suffix.
+     *         If you want lossless Snapshots, supply a `.png` filename. Otherwise, use `.jpeg` or `.jpg`.
+     *     Otherwise, ".jpg" is appended to the user's requested filename so that the image is saved in JPG format.
+     * If the user hasn't supplied a specific filename for the snapshot:
+     *     Save the snapshot in JPG format according to FILENAME_PATH_FORMAT
      * @function Window.takeSnapshot
      * @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
      *     signal.

interface/src/ui/LoginDialog.cpp

@@ -113,9 +113,8 @@ void LoginDialog::linkSteam() {
             }
 
             JSONCallbackParameters callbackParams;
-            callbackParams.jsonCallbackReceiver = this;
+            callbackParams.callbackReceiver = this;
             callbackParams.jsonCallbackMethod = "linkCompleted";
-            callbackParams.errorCallbackReceiver = this;
             callbackParams.errorCallbackMethod = "linkFailed";
 
             const QString LINK_STEAM_PATH = "api/v1/user/steam/link";
@@ -141,9 +140,8 @@ void LoginDialog::createAccountFromStream(QString username) {
             }
 
             JSONCallbackParameters callbackParams;
-            callbackParams.jsonCallbackReceiver = this;
+            callbackParams.callbackReceiver = this;
             callbackParams.jsonCallbackMethod = "createCompleted";
-            callbackParams.errorCallbackReceiver = this;
             callbackParams.errorCallbackMethod = "createFailed";
 
             const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "api/v1/user/steam/create";
@@ -185,28 +183,27 @@ void LoginDialog::openUrl(const QString& url) const {
     }
 }
 
-void LoginDialog::linkCompleted(QNetworkReply& reply) {
+void LoginDialog::linkCompleted(QNetworkReply* reply) {
     emit handleLinkCompleted();
 }
 
-void LoginDialog::linkFailed(QNetworkReply& reply) {
-    emit handleLinkFailed(reply.errorString());
+void LoginDialog::linkFailed(QNetworkReply* reply) {
+    emit handleLinkFailed(reply->errorString());
 }
 
-void LoginDialog::createCompleted(QNetworkReply& reply) {
+void LoginDialog::createCompleted(QNetworkReply* reply) {
     emit handleCreateCompleted();
 }
 
-void LoginDialog::createFailed(QNetworkReply& reply) {
-    emit handleCreateFailed(reply.errorString());
+void LoginDialog::createFailed(QNetworkReply* reply) {
+    emit handleCreateFailed(reply->errorString());
 }
 
 void LoginDialog::signup(const QString& email, const QString& username, const QString& password) {
     
     JSONCallbackParameters callbackParams;
-    callbackParams.jsonCallbackReceiver = this;
+    callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "signupCompleted";
-    callbackParams.errorCallbackReceiver = this;
     callbackParams.errorCallbackMethod = "signupFailed";
     
     QJsonObject payload;
@@ -228,7 +225,7 @@ void LoginDialog::signup(const QString& email, const QString& username, const QS
                                 QJsonDocument(payload).toJson());
 }
 
-void LoginDialog::signupCompleted(QNetworkReply& reply) {
+void LoginDialog::signupCompleted(QNetworkReply* reply) {
     emit handleSignupCompleted();
 }
 
@@ -242,10 +239,10 @@ QString errorStringFromAPIObject(const QJsonValue& apiObject) {
     }
 }
 
-void LoginDialog::signupFailed(QNetworkReply& reply) {
+void LoginDialog::signupFailed(QNetworkReply* reply) {
     
     // parse the returned JSON to see what the problem was
-    auto jsonResponse = QJsonDocument::fromJson(reply.readAll());
+    auto jsonResponse = QJsonDocument::fromJson(reply->readAll());
     
     static const QString RESPONSE_DATA_KEY = "data";
     

interface/src/ui/LoginDialog.h

@@ -42,14 +42,14 @@ signals:
     void handleSignupFailed(QString errorString);
 
 public slots:
-    void linkCompleted(QNetworkReply& reply);
-    void linkFailed(QNetworkReply& reply);
+    void linkCompleted(QNetworkReply* reply);
+    void linkFailed(QNetworkReply* reply);
 
-    void createCompleted(QNetworkReply& reply);
-    void createFailed(QNetworkReply& reply);
+    void createCompleted(QNetworkReply* reply);
+    void createFailed(QNetworkReply* reply);
     
-    void signupCompleted(QNetworkReply& reply);
-    void signupFailed(QNetworkReply& reply);
+    void signupCompleted(QNetworkReply* reply);
+    void signupFailed(QNetworkReply* reply);
 
 protected slots:
     Q_INVOKABLE bool isSteamRunning() const;

interface/src/ui/OverlayConductor.cpp

@@ -88,38 +88,24 @@ void OverlayConductor::update(float dt) {
         _hmdMode = false;
     }
 
-    bool isAtRest = updateAvatarIsAtRest();
-    bool isMoving = !isAtRest;
-
     bool shouldRecenter = false;
 
-    if (_flags & SuppressedByMove) {
-        if (!isMoving) {
-            _flags &= ~SuppressedByMove;
-            shouldRecenter = true;
-        }
-    } else {
-        if (myAvatar->getClearOverlayWhenMoving() && isMoving) {
-            _flags |= SuppressedByMove;
-        }
-    }
-
-    if (_flags & SuppressedByHead) {
-        if (isAtRest) {
-            _flags &= ~SuppressedByHead;
+    if (_suppressedByHead) {
+        if (updateAvatarIsAtRest()) {
+            _suppressedByHead = false;
             shouldRecenter = true;
         }
     } else {
         if (_hmdMode && headOutsideOverlay()) {
-            _flags |= SuppressedByHead;
+            _suppressedByHead = true;
         }
     }
 
-    bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && (0 == (_flags & SuppressMask));
+    bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && !_suppressedByHead;
     if (targetVisible != currentVisible) {
         offscreenUi->setPinned(!targetVisible);
     }
-    if (shouldRecenter && !_flags) {
+    if (shouldRecenter && !_suppressedByHead) {
         centerUI();
     }
 }