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

assignment-client/src/audio/AudioMixerClientData.cpp

@@ -202,7 +202,7 @@ void AudioMixerClientData::parsePerAvatarGainSet(ReceivedMessage& message, const
     }
 }
 
-void AudioMixerClientData::setGainForAvatar(QUuid nodeID, uint8_t gain) {
+void AudioMixerClientData::setGainForAvatar(QUuid nodeID, float gain) {
     auto it = std::find_if(_streams.active.cbegin(), _streams.active.cend(), [nodeID](const MixableStream& mixableStream){
         return mixableStream.nodeStreamID.nodeID == nodeID && mixableStream.nodeStreamID.streamID.isNull();
     });

assignment-client/src/audio/AudioMixerClientData.h

@@ -172,7 +172,7 @@ private:
 
     void optionallyReplicatePacket(ReceivedMessage& packet, const Node& node);
 
-    void setGainForAvatar(QUuid nodeID, uint8_t gain);
+    void setGainForAvatar(QUuid nodeID, float gain);
 
     bool containsValidPosition(ReceivedMessage& message) const;
 

interface/resources/qml/OverlayLoginDialog.qml

@@ -49,6 +49,19 @@ FocusScope {
             anchors.fill: parent
         }
     }
+
+    Timer {
+        id: keyboardTimer
+        repeat: false
+        interval: 200
+
+        onTriggered: {
+            if (MenuInterface.isOptionChecked("Use 3D Keyboard")) {
+                KeyboardScriptingInterface.raised = true;
+            }
+        }
+    }
+
     HifiControlsUit.Keyboard {
         id: loginKeyboard
         raised: root.keyboardEnabled && root.keyboardRaised
@@ -95,7 +108,12 @@ FocusScope {
         }
     }
 
+    Component.onDestruction: {
+        loginKeyboard.raised = false;
+    }
+
     Component.onCompleted: {
+        keyboardTimer.start();
         bodyLoader.setSource("LoginDialog/LinkAccountBody.qml", { "loginDialog": loginDialog, "root": root, "bodyLoader": bodyLoader });
     }
 }

interface/resources/qml/controls/TabletWebView.qml

@@ -195,6 +195,10 @@ Item {
         keyboardEnabled = HMD.active;
     }
 
+    Component.onDestruction: {
+        keyboardRaised = false;
+    }
+
     Keys.onPressed: {
         switch(event.key) {
         case Qt.Key_L: