Merge remote-tracking branch 'upstream/master' into qt59

interface/resources/qml/hifi/dialogs/TabletAssetServer.qml

@@ -506,7 +506,7 @@ Rectangle {
         }
         HifiControls.Tree {
             id: treeView
-            height: 430
+            height: 290
             anchors.leftMargin: hifi.dimensions.contentMargin.x + 2  // Extra for border
             anchors.rightMargin: hifi.dimensions.contentMargin.x + 2  // Extra for border
             anchors.left: parent.left

libraries/audio/src/AudioInjector.cpp

@@ -27,8 +27,6 @@
 #include "AudioSRC.h"
 #include "AudioHelpers.h"
 
-int audioInjectorPtrMetaTypeId = qRegisterMetaType<AudioInjector*>();
-
 AbstractAudioInterface* AudioInjector::_localAudioInterface{ nullptr };
 
 AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs) {

libraries/audio/src/AudioInjector.h

@@ -125,6 +125,4 @@ private:
     friend class AudioInjectorManager;
 };
 
-Q_DECLARE_METATYPE(AudioInjectorPointer)
-
 #endif // hifi_AudioInjector_h

scripts/system/controllers/handControllerGrab.js

@@ -1034,9 +1034,18 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp) {
 
 function getControllerJointIndex(hand) {
     if (HMD.isHandControllerAvailable()) {
-        return MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+        var controllerJointIndex = -1;
-                                      "_CONTROLLER_RIGHTHAND" :
+        if (Camera.mode === "first person") {
-                                      "_CONTROLLER_LEFTHAND");
+            controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                                                          "_CONTROLLER_RIGHTHAND" :
+                                                          "_CONTROLLER_LEFTHAND");
+        } else if (Camera.mode === "third person") {
+            controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                                                          "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                                                          "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
+        }
+        
+        return controllerJointIndex;
     }
 
     return MyAvatar.getJointIndex("Head");

scripts/tutorials/entity_scripts/sit.js

@@ -12,9 +12,9 @@
     Script.include("/~/system/libraries/utils.js");
     if (!String.prototype.startsWith) {
         String.prototype.startsWith = function(searchString, position){
-          position = position || 0;
+            position = position || 0;
-          return this.substr(position, searchString.length) === searchString;
+            return this.substr(position, searchString.length) === searchString;
-      };
+        };
     }
 
     var SETTING_KEY = "com.highfidelity.avatar.isSitting";
@@ -122,10 +122,20 @@
 
     this.rolesToOverride = function() {
         return MyAvatar.getAnimationRoles().filter(function(role) {
-            return role === "fly" || role.startsWith("inAir");
+            return !(role.startsWith("right") || role.startsWith("left"));
         });
     }
 
+    // Handler for user changing the avatar model while sitting. There's currently an issue with changing avatar models while override role animations are applied,
+    // so to avoid that problem, re-apply the role overrides once the model has finished changing.
+    this.modelURLChangeFinished = function () {
+        print("Sitter's model has FINISHED changing. Reapply anim role overrides.");
+        var roles = this.rolesToOverride();
+        for (i in roles) {
+            MyAvatar.overrideRoleAnimation(roles[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
+        }
+    }
+
     this.sitDown = function() {
         if (this.checkSeatForAvatar()) {
             print("Someone is already sitting in that chair.");
@@ -164,12 +174,14 @@
             return { headType: 0 };
         }, ["headType"]);
         Script.update.connect(this, this.update);
+        MyAvatar.onLoadComplete.connect(this, this.modelURLChangeFinished);
     }
 
     this.standUp = function() {
         print("Standing up (" + this.entityID + ")");
         MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
         Script.update.disconnect(this, this.update);
+        MyAvatar.onLoadComplete.disconnect(this, this.modelURLChangeFinished);
 
         if (MyAvatar.sessionUUID === this.getSeatUser()) {
             this.setSeatUser(null);
@@ -331,7 +343,7 @@
         }
         this.cleanupOverlay();
     }
-
+    
     this.clickDownOnEntity = function (id, event) {
         if (isInEditMode()) {
             return;