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

android/app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
     <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
 
@@ -75,6 +76,15 @@
             android:enabled="true"
             android:exported="false"
             android:process=":breakpad_uploader"/>
+
+        <receiver
+            android:name=".receiver.HeadsetStateReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.HEADSET_PLUG" />
+            </intent-filter>
+        </receiver>
     </application>
 
     <uses-feature android:name="android.software.vr.mode" android:required="true"/>

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

@@ -355,5 +355,51 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_WebViewActivity_nativeProcessU
     AndroidHelper::instance().processURL(QString::fromUtf8(nativeString));
 }
 
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SettingsFragment_updateHifiSetting(JNIEnv *env,
+                                                                               jobject instance,
+                                                                               jstring group_,
+                                                                               jstring key_,
+                                                                               jboolean value_) {
+    const char *c_group = env->GetStringUTFChars(group_, 0);
+    const char *c_key = env->GetStringUTFChars(key_, 0);
+
+    const QString group = QString::fromUtf8(c_group);
+    const QString key = QString::fromUtf8(c_key);
+
+    env->ReleaseStringUTFChars(group_, c_group);
+    env->ReleaseStringUTFChars(key_, c_key);
+
+    bool value = value_;
+
+    Setting::Handle<bool> setting { QStringList() << group << key , !value };
+    setting.set(value);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_io_highfidelity_hifiinterface_fragment_SettingsFragment_getHifiSettingBoolean(JNIEnv *env,
+                                                                                   jobject instance,
+                                                                                   jstring group_,
+                                                                                   jstring key_,
+                                                                                   jboolean defaultValue) {
+    const char *c_group = env->GetStringUTFChars(group_, 0);
+    const char *c_key = env->GetStringUTFChars(key_, 0);
+
+    const QString group = QString::fromUtf8(c_group);
+    const QString key = QString::fromUtf8(c_key);
+
+    env->ReleaseStringUTFChars(group_, c_group);
+    env->ReleaseStringUTFChars(key_, c_key);
+
+    Setting::Handle<bool> setting { QStringList() << group << key , defaultValue};
+    return setting.get();
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_hifiinterface_receiver_HeadsetStateReceiver_notifyHeadsetOn(JNIEnv *env,
+                                                                                 jobject instance,
+                                                                                 jboolean pluggedIn) {
+    AndroidHelper::instance().notifyHeadsetOn(pluggedIn);
+}
 
 }

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

@@ -13,6 +13,7 @@ package io.highfidelity.hifiinterface;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -40,6 +41,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import io.highfidelity.hifiinterface.fragment.WebViewFragment;
+import io.highfidelity.hifiinterface.receiver.HeadsetStateReceiver;
 
 /*import com.google.vr.cardboard.DisplaySynchronizer;
 import com.google.vr.cardboard.DisplayUtils;
@@ -55,6 +57,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     private static final int NORMAL_DPI = 160;
 
     private Vibrator mVibrator;
+    private HeadsetStateReceiver headsetStateReceiver;
 
     //public static native void handleHifiURL(String hifiURLString);
     private native long nativeOnCreate(InterfaceActivity instance, AssetManager assetManager);
@@ -151,6 +154,8 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
         qtLayout.addView(webSlidingDrawer, layoutParams);
         webSlidingDrawer.setVisibility(View.GONE);
+
+        headsetStateReceiver = new HeadsetStateReceiver();
     }
 
     @Override
@@ -161,6 +166,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         } else {
             nativeEnterBackground();
         }
+        unregisterReceiver(headsetStateReceiver);
         //gvrApi.pauseTracking();
     }
 
@@ -183,6 +189,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         nativeEnterForeground();
         surfacesWorkaround();
         keepInterfaceRunning = false;
+        registerReceiver(headsetStateReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
         //gvrApi.resumeTracking();
     }
 

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

@@ -33,6 +33,7 @@ import io.highfidelity.hifiinterface.fragment.FriendsFragment;
 import io.highfidelity.hifiinterface.fragment.HomeFragment;
 import io.highfidelity.hifiinterface.fragment.LoginFragment;
 import io.highfidelity.hifiinterface.fragment.PolicyFragment;
+import io.highfidelity.hifiinterface.fragment.SettingsFragment;
 import io.highfidelity.hifiinterface.task.DownloadProfileImageTask;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener,
@@ -80,6 +81,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
         mPeopleMenuItem = mNavigationView.getMenu().findItem(R.id.action_people);
 
+        updateDebugMenu(mNavigationView.getMenu());
+
         Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setTitleTextAppearance(this, R.style.HomeActionBarTitleStyle);
         setSupportActionBar(toolbar);
@@ -108,6 +111,16 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         }
     }
 
+    private void updateDebugMenu(Menu menu) {
+        if (BuildConfig.DEBUG) {
+            for (int i=0; i < menu.size(); i++) {
+                if (menu.getItem(i).getItemId() == R.id.action_debug_settings) {
+                    menu.getItem(i).setVisible(true);
+                }
+            }
+        }
+    }
+
     private void loadFragment(String fragment) {
         switch (fragment) {
             case "Login":
@@ -151,6 +164,13 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         loadFragment(fragment, getString(R.string.people), getString(R.string.tagFragmentPeople), true);
     }
 
+    private void loadSettingsFragment() {
+        SettingsFragment fragment = SettingsFragment.newInstance();
+
+        loadFragment(fragment, getString(R.string.settings), getString(R.string.tagSettings), true);
+    }
+
+
     private void loadFragment(Fragment fragment, String title, String tag, boolean addToBackStack) {
         FragmentManager fragmentManager = getFragmentManager();
 
@@ -241,6 +261,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             case R.id.action_people:
                 loadPeopleFragment();
                 return true;
+            case R.id.action_debug_settings:
+                loadSettingsFragment();
+                return true;
         }
         return false;
     }

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/SettingsFragment.java

@@ -0,0 +1,63 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.content.SharedPreferences;
+import android.media.audiofx.AcousticEchoCanceler;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.support.annotation.Nullable;
+
+import io.highfidelity.hifiinterface.R;
+
+public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+    public native void updateHifiSetting(String group, String key, boolean value);
+    public native boolean getHifiSettingBoolean(String group, String key, boolean defaultValue);
+
+    private final String HIFI_SETTINGS_ANDROID_GROUP = "Android";
+    private final String HIFI_SETTINGS_AEC_KEY = "aec";
+    private final String PREFERENCE_KEY_AEC = "aec";
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.settings);
+
+        if (!AcousticEchoCanceler.isAvailable()) {
+            getPreferenceScreen().getPreferenceManager().findPreference("aec").setEnabled(false);
+        }
+
+        getPreferenceScreen().getSharedPreferences().edit().putBoolean(PREFERENCE_KEY_AEC,
+                getHifiSettingBoolean(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, false));
+    }
+
+    public static SettingsFragment newInstance() {
+        SettingsFragment fragment = new SettingsFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        Preference pref = findPreference(key);
+        switch (key) {
+            case "aec":
+                updateHifiSetting(HIFI_SETTINGS_ANDROID_GROUP, HIFI_SETTINGS_AEC_KEY, sharedPreferences.getBoolean(key, false));
+                break;
+            default:
+                break;
+        }
+    }
+}

android/app/src/main/java/io/highfidelity/hifiinterface/receiver/HeadsetStateReceiver.java

@@ -0,0 +1,18 @@
+package io.highfidelity.hifiinterface.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.util.Log;
+
+public class HeadsetStateReceiver extends BroadcastReceiver {
+
+    private native void notifyHeadsetOn(boolean pluggedIn);
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        notifyHeadsetOn(audioManager.isWiredHeadsetOn());
+    }
+}

android/app/src/main/res/menu/menu_navigation.xml

@@ -9,4 +9,9 @@
         android:id="@+id/action_people"
         android:title="@string/people"
         />
+    <item
+        android:id="@+id/action_debug_settings"
+        android:title="@string/settings"
+        android:visible="false"
+    />
 </menu>

android/app/src/main/res/values/strings.xml

@@ -29,4 +29,9 @@
     <string name="tagFragmentLogin">tagFragmentLogin</string>
     <string name="tagFragmentPolicy">tagFragmentPolicy</string>
     <string name="tagFragmentPeople">tagFragmentPeople</string>
+    <string name="tagSettings">tagSettings</string>
+    <string name="settings">Settings</string>
+    <string name="AEC">AEC</string>
+    <string name="acoustic_echo_cancellation">Acoustic Echo Cancellation</string>
+    <string name="settings_developer">Developer</string>
 </resources>

android/app/src/main/res/xml/settings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/settings_developer"
+        android:key="pref_key_developer">
+        <SwitchPreference
+            android:key="aec"
+            android:title="@string/AEC"
+            android:summary="@string/acoustic_echo_cancellation" />
+    </PreferenceCategory>
+</PreferenceScreen>

android/build.gradle

@@ -72,17 +72,17 @@ 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.11.1_linux_armv8-libcpp_openssl.tgz'
+def qtFile='qt-5.11.1_linux_armv8-libcpp_openssl_patched.tgz'
-def qtChecksum='f312c47cd8b8dbca824c32af4eec5e66'
+def qtChecksum='aa449d4bfa963f3bc9a9dfe558ba29df'
-def qtVersionId='nyCGcb91S4QbYeJhUkawO5x1lrLdSNB_'
+def qtVersionId='3S97HBM5G5Xw9EfE52sikmgdN3t6C2MN'
 if (Os.isFamily(Os.FAMILY_MAC)) {
-    qtFile = 'qt-5.11.1_osx_armv8-libcpp_openssl.tgz'
+    qtFile = 'qt-5.11.1_osx_armv8-libcpp_openssl_patched.tgz'
-    qtChecksum='a0c8b394aec5b0fcd46714ca3a53278a'
+    qtChecksum='c83cc477c08a892e00c71764dca051a0'
-    qtVersionId='QNa.lwNJaPc0eGuIL.xZ8ebeTuLL7rh8'
+    qtVersionId='OxBD7iKINv1HbyOXmAmDrBb8AF3N.Kup'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-    qtFile = 'qt-5.11.1_win_armv8-libcpp_openssl.tgz'
+    qtFile = 'qt-5.11.1_win_armv8-libcpp_openssl_patched.tgz'
-    qtChecksum='d80aed4233ce9e222aae8376e7a94bf9'
+    qtChecksum='0582191cc55431aa4f660848a542883e'
-    qtVersionId='iDVXu0i3WEXRFIxQCtzcJ2XuKrE8RIqB'
+    qtVersionId='JfWM0P_Mz5Qp0LwpzhrsRwN3fqlLSFeT'
 }
 
 def packages = [

interface/resources/icons/tablet-icons/people-a-msg.svg

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 50 50"
+   style="enable-background:new 0 0 50 50;"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="people-a.svg"><metadata
+     id="metadata24"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs22" /><sodipodi:namedview
+     pagecolor="#ff0000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="852"
+     inkscape:window-height="480"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="4.72"
+     inkscape:cx="25"
+     inkscape:cy="25"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><style
+     type="text/css"
+     id="style4">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#EF3B4E;}
+</style>
+<circle class="st1" cx="44.1" cy="6" r="5.6"/>
+<g
+     id="Layer_2" /><g
+     id="Layer_1"
+     style="fill:#000000;fill-opacity:1"><circle
+       class="st0"
+       cx="25.6"
+       cy="14.8"
+       r="8.1"
+       id="circle8"
+       style="fill:#000000;fill-opacity:1" /><path
+       class="st0"
+       d="M31.4,27h-11c-4.6,0-8.2,3.9-8.2,8.5v4.3c3.8,2.8,8.1,4.5,13.1,4.5c5.6,0,10.6-2.1,14.4-5.6v-3.2   C39.6,30.9,35.9,27,31.4,27z"
+       id="path10"
+       style="fill:#000000;fill-opacity:1" /><circle
+       class="st0"
+       cx="41.6"
+       cy="17.1"
+       r="3.5"
+       id="circle12"
+       style="fill:#000000;fill-opacity:1" /><path
+       class="st0"
+       d="M43.9,23.9h-4.1c-0.9,0-1.7,0.4-2.3,1c1.2,0.6,2.3,1.6,3.1,2.5c1,1.2,1.5,2.7,1.7,4.3c0.3,0.9,0.4,1.8,0.2,2.8   v0.6c1.6-2.2,3.3-6,4-8.1v-0.3C46.5,25.7,45.3,23.9,43.9,23.9z"
+       id="path14"
+       style="fill:#000000;fill-opacity:1" /><circle
+       class="st0"
+       cx="9.4"
+       cy="18"
+       r="3.5"
+       id="circle16"
+       style="fill:#000000;fill-opacity:1" /><path
+       class="st0"
+       d="M8.5,35.7c-0.1-0.7-0.1-1.4,0-2.1l0.1-0.2c0-0.2,0-0.4,0-0.6c0-0.2,0-0.3,0.1-0.5c0-0.2,0-0.3,0-0.5   c0.2-2.1,1.6-4.4,3.2-5.7c0.4-0.4,0.9-0.6,1.4-0.9c-0.5-0.5-1.3-0.7-2-0.7H7c-1.4,0-2.6,1.8-2.4,2.7v0.3   C5.1,29.8,6.8,33.5,8.5,35.7z"
+       id="path18"
+       style="fill:#000000;fill-opacity:1" /></g></svg>

interface/resources/icons/tablet-icons/people-i-msg.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#EF3B4E;}
+</style>
+<circle class="st1" cx="44.1" cy="6" r="5.6"/>
+<g id="Layer_2">
+</g>
+<g id="Layer_1">
+	<circle class="st0" cx="25.6" cy="14.8" r="8.1"/>
+	<path class="st0" d="M31.4,27h-11c-4.6,0-8.2,3.9-8.2,8.5v4.3c3.8,2.8,8.1,4.5,13.1,4.5c5.6,0,10.6-2.1,14.4-5.6v-3.2
+		C39.6,30.9,35.9,27,31.4,27z"/>
+	<circle class="st0" cx="41.6" cy="17.1" r="3.5"/>
+	<path class="st0" d="M43.9,23.9h-4.1c-0.9,0-1.7,0.4-2.3,1c1.2,0.6,2.3,1.6,3.1,2.5c1,1.2,1.5,2.7,1.7,4.3c0.3,0.9,0.4,1.8,0.2,2.8
+		v0.6c1.6-2.2,3.3-6,4-8.1v-0.3C46.5,25.7,45.3,23.9,43.9,23.9z"/>
+	<circle class="st0" cx="9.4" cy="18" r="3.5"/>
+	<path class="st0" d="M8.5,35.7c-0.1-0.7-0.1-1.4,0-2.1l0.1-0.2c0-0.2,0-0.4,0-0.6c0-0.2,0-0.3,0.1-0.5c0-0.2,0-0.3,0-0.5
+		c0.2-2.1,1.6-4.4,3.2-5.7c0.4-0.4,0.9-0.6,1.4-0.9c-0.5-0.5-1.3-0.7-2-0.7H7c-1.4,0-2.6,1.8-2.4,2.7v0.3
+		C5.1,29.8,6.8,33.5,8.5,35.7z"/>
+</g>
+</svg>

interface/resources/qml/AnimStats.qml

@@ -48,35 +48,11 @@ Item {
                     spacing: 4; x: 4; y: 4;
 
                     StatText {
-                        text: "State Machines:---------------------------------------------------------------------------"
+                        text: root.positionText
                     }
-                    ListView {
-                        width: firstCol.width
-                        height: root.animStateMachines.length * 15
-                        visible: root.animStateMchines.length > 0;
-                        model: root.animStateMachines
-                        delegate: StatText {
-                            text: {
-                                return modelData;
-                            }
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                width: secondCol.width + 8
-                height: secondCol.height + 8
-                color: root.bgColor;
-
-                Column {
-                    id: secondCol
-                    spacing: 4; x: 4; y: 4;
-
                     StatText {
                         text: "Anim Vars:--------------------------------------------------------------------------------"
                     }
-
                     ListView {
                         width: secondCol.width
                         height: root.animVars.length * 15
@@ -104,6 +80,36 @@ Item {
                 }
             }
 
+            Rectangle {
+                width: secondCol.width + 8
+                height: secondCol.height + 8
+                color: root.bgColor;
+
+                Column {
+                    id: secondCol
+                    spacing: 4; x: 4; y: 4;
+
+                    StatText {
+                        text: root.rotationText
+                    }
+                    StatText {
+                        text: "State Machines:---------------------------------------------------------------------------"
+                    }
+                    ListView {
+                        width: firstCol.width
+                        height: root.animStateMachines.length * 15
+                        visible: root.animStateMachines.length > 0;
+                        model: root.animStateMachines
+                        delegate: StatText {
+                            text: {
+                                return modelData;
+                            }
+                        }
+                    }
+
+                }
+            }
+
             Rectangle {
                 width: thirdCol.width + 8
                 height: thirdCol.height + 8
@@ -113,10 +119,12 @@ Item {
                     id: thirdCol
                     spacing: 4; x: 4; y: 4;
 
+                    StatText {
+                        text: root.velocityText
+                    }
                     StatText {
                         text: "Alpha Values:--------------------------------------------------------------------------"
                     }
-
                     ListView {
                         width: thirdCol.width
                         height: root.animAlphaValues.length * 15

interface/resources/qml/hifi/Pal.qml

@@ -271,6 +271,8 @@ Rectangle {
                             connectionsUserModel.getFirstPage();
                         }
                         activeTab = "connectionsTab";
+                        connectionsOnlineDot.visible = false;
+                        pal.sendToScript({method: 'hideNotificationDot'});
                         connectionsHelpText.color = hifi.colors.blueAccent;
                     }
                 }
@@ -298,6 +300,16 @@ Rectangle {
                             }
                         }
                     }
+                    Rectangle {
+                        id: connectionsOnlineDot;
+                        visible: false;
+                        width: 10;
+                        height: width;
+                        radius: width;
+                        color: "#EF3B4E"
+                        anchors.left: parent.left;
+                        anchors.verticalCenter: parent.verticalCenter;
+                    }
                     // "CONNECTIONS" text
                     RalewaySemiBold {
                         id: connectionsTabSelectorText;
@@ -305,7 +317,11 @@ Rectangle {
                         // Text size
                         size: hifi.fontSizes.tabularData;
                         // Anchors
-                        anchors.fill: parent;
+                        anchors.left: connectionsOnlineDot.visible ? connectionsOnlineDot.right : parent.left;
+                        anchors.leftMargin: connectionsOnlineDot.visible ? 4 : 0;
+                        anchors.top: parent.top;
+                        anchors.bottom: parent.bottom;
+                        anchors.right: parent.right;
                         // Style
                         font.capitalization: Font.AllUppercase;
                         color: activeTab === "connectionsTab" ? hifi.colors.blueAccent : hifi.colors.baseGray;
@@ -326,7 +342,7 @@ Rectangle {
                         anchors.left: connectionsTabSelectorTextContainer.left;
                         anchors.top: connectionsTabSelectorTextContainer.top;
                         anchors.topMargin: 1;
-                        anchors.leftMargin: connectionsTabSelectorTextMetrics.width + 42;
+                        anchors.leftMargin: connectionsTabSelectorTextMetrics.width + 42 + connectionsOnlineDot.width + connectionsTabSelectorText.anchors.leftMargin;
                         RalewayRegular {
                             id: connectionsHelpText;
                             text: "[?]";
@@ -1267,6 +1283,9 @@ Rectangle {
         case 'http.response':
             http.handleHttpResponse(message);
             break;
+        case 'changeConnectionsDotStatus':
+            connectionsOnlineDot.visible = message.shouldShowDot;
+            break;
         default:
             console.log('Unrecognized message:', JSON.stringify(message));
         }

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

@@ -408,9 +408,7 @@ Rectangle {
 
         Connections {
             onSendSignalToWallet: {
-                if (msg.method === 'walletReset' || msg.method === 'passphraseReset') {
+                if (msg.method === 'walletSecurity_changeSecurityImage') {
-                    sendToScript(msg);
-                } else if (msg.method === 'walletSecurity_changeSecurityImage') {
                     securityImageChange.initModel();
                     root.activeView = "securityImageChange";
                 }

interface/src/AndroidHelper.cpp

@@ -10,6 +10,7 @@
 //
 #include "AndroidHelper.h"
 #include <QDebug>
+#include <AudioClient.h>
 #include "Application.h"
 
 #if defined(qApp)
@@ -18,6 +19,7 @@
 #define qApp (static_cast<Application*>(QCoreApplication::instance()))
 
 AndroidHelper::AndroidHelper() {
+    qRegisterMetaType<QAudio::Mode>("QAudio::Mode");
 }
 
 AndroidHelper::~AndroidHelper() {
@@ -56,3 +58,12 @@ void AndroidHelper::processURL(const QString &url) {
         qApp->acceptURL(url);
     }
 }
+
+void AndroidHelper::notifyHeadsetOn(bool pluggedIn) {
+#if defined (Q_OS_ANDROID)
+    auto audioClient = DependencyManager::get<AudioClient>();
+    if (audioClient) {
+        QMetaObject::invokeMethod(audioClient.data(), "setHeadsetPluggedIn", Q_ARG(bool, pluggedIn));
+    }
+#endif
+}

interface/src/AndroidHelper.h

@@ -29,6 +29,7 @@ public:
 
     void performHapticFeedback(int duration);
     void processURL(const QString &url);
+    void notifyHeadsetOn(bool pluggedIn);
 
     AndroidHelper(AndroidHelper const&)  = delete;
     void operator=(AndroidHelper const&) = delete;

interface/src/raypick/ParabolaPointer.cpp

@@ -382,9 +382,8 @@ void ParabolaPointer::RenderState::ParabolaRenderItem::updateBounds() {
 
 const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabolaPipeline() {
     if (!_parabolaPipeline || !_transparentParabolaPipeline) {
-        gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola);
-
         {
+            gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola);
             auto state = std::make_shared<gpu::State>();
             state->setDepthTest(true, true, gpu::LESS_EQUAL);
             state->setBlendFunction(false,
@@ -396,6 +395,7 @@ const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::get
         }
 
         {
+            gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola_translucent);
             auto state = std::make_shared<gpu::State>();
             state->setDepthTest(true, true, gpu::LESS_EQUAL);
             state->setBlendFunction(true,

interface/src/ui/AnimStats.cpp

@@ -42,6 +42,29 @@ void AnimStats::updateStats(bool force) {
     auto myAvatar = avatarManager->getMyAvatar();
     auto debugAlphaMap = myAvatar->getSkeletonModel()->getRig().getDebugAlphaMap();
 
+    glm::vec3 position = myAvatar->getWorldPosition();
+    glm::quat rotation = myAvatar->getWorldOrientation();
+    glm::vec3 velocity = myAvatar->getWorldVelocity();
+
+    _positionText = QString("Position: (%1, %2, %3)").
+        arg(QString::number(position.x, 'f', 2)).
+        arg(QString::number(position.y, 'f', 2)).
+        arg(QString::number(position.z, 'f', 2));
+    emit positionTextChanged();
+
+    glm::vec3 eulerRotation = safeEulerAngles(rotation);
+    _rotationText = QString("Heading: %1").
+        arg(QString::number(glm::degrees(eulerRotation.y), 'f', 2));
+    emit rotationTextChanged();
+
+    // transform velocity into rig coordinate frame. z forward.
+    glm::vec3 localVelocity = Quaternions::Y_180 * glm::inverse(rotation) * velocity;
+    _velocityText = QString("Local Vel: (%1, %2, %3)").
+        arg(QString::number(localVelocity.x, 'f', 2)).
+        arg(QString::number(localVelocity.y, 'f', 2)).
+        arg(QString::number(localVelocity.z, 'f', 2));
+    emit velocityTextChanged();
+
     // update animation debug alpha values
     QStringList newAnimAlphaValues;
     qint64 now = usecTimestampNow();

interface/src/ui/AnimStats.h

@@ -19,6 +19,9 @@ class AnimStats : public QQuickItem {
     Q_PROPERTY(QStringList animAlphaValues READ animAlphaValues NOTIFY animAlphaValuesChanged)
     Q_PROPERTY(QStringList animVars READ animVars NOTIFY animVarsChanged)
     Q_PROPERTY(QStringList animStateMachines READ animStateMachines NOTIFY animStateMachinesChanged)
+    Q_PROPERTY(QString positionText READ positionText NOTIFY positionTextChanged)
+    Q_PROPERTY(QString rotationText READ rotationText NOTIFY rotationTextChanged)
+    Q_PROPERTY(QString velocityText READ velocityText NOTIFY velocityTextChanged)
 
 public:
     static AnimStats* getInstance();
@@ -27,9 +30,13 @@ public:
 
     void updateStats(bool force = false);
 
-    QStringList animAlphaValues() { return _animAlphaValues; }
+    QStringList animAlphaValues() const { return _animAlphaValues; }
-    QStringList animVars() { return _animVarsList; }
+    QStringList animVars() const { return _animVarsList; }
-    QStringList animStateMachines() { return _animStateMachines; }
+    QStringList animStateMachines() const { return _animStateMachines; }
+
+    QString positionText() const { return _positionText; }
+    QString rotationText() const { return _rotationText; }
+    QString velocityText() const { return _velocityText; }
 
 public slots:
     void forceUpdateStats() { updateStats(true); }
@@ -39,6 +46,9 @@ signals:
     void animAlphaValuesChanged();
     void animVarsChanged();
     void animStateMachinesChanged();
+    void positionTextChanged();
+    void rotationTextChanged();
+    void velocityTextChanged();
 
 private:
     QStringList _animAlphaValues;
@@ -50,6 +60,10 @@ private:
     std::map<QString, qint64> _animVarChangedTimers; // last time animVar value has changed.
 
     QStringList _animStateMachines;
+
+    QString _positionText;
+    QString _rotationText;
+    QString _velocityText;
 };
 
 #endif // hifi_AnimStats_h

interface/src/ui/overlays/ContextOverlayInterface.cpp

@@ -252,12 +252,6 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
 void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
     if (overlayID == _contextOverlayID  && event.getButton() == PointerEvent::PrimaryButton) {
         qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
-        Setting::Handle<bool> _settingSwitch{ "commerce", true };
-        if (_settingSwitch.get()) {
-            openInspectionCertificate();
-        } else {
-            openMarketplace();
-        }
         emit contextOverlayClicked(_currentEntityWithContextOverlay);
         _contextOverlayJustClicked = true;
     }
@@ -390,34 +384,6 @@ void ContextOverlayInterface::requestOwnershipVerification(const QUuid& entityID
     }
 }
 
-static const QString INSPECTION_CERTIFICATE_QML_PATH = "hifi/commerce/inspectionCertificate/InspectionCertificate.qml";
-void ContextOverlayInterface::openInspectionCertificate() {
-    // lets open the tablet to the inspection certificate QML
-    if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) {
-        setLastInspectedEntity(_currentEntityWithContextOverlay);
-        auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
-        tablet->loadQMLSource(INSPECTION_CERTIFICATE_QML_PATH);
-        _hmdScriptingInterface->openTablet();
-    }
-}
-
-static const QString MARKETPLACE_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/marketplace/items/";
-
-void ContextOverlayInterface::openMarketplace() {
-    // lets open the tablet and go to the current item in
-    // the marketplace (if the current entity has a
-    // marketplaceID)
-    if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) {
-        auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
-        // construct the url to the marketplace item
-        QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID;
-        QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
-        tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
-        _hmdScriptingInterface->openTablet();
-        _isInMarketplaceInspectionMode = true;
-    }
-}
-
 void ContextOverlayInterface::enableEntityHighlight(const EntityItemID& entityItemID) {
     _selectionScriptingInterface->addToSelectedItemsList("contextOverlayHighlightList", "entity", entityItemID);
 }

interface/src/ui/overlays/ContextOverlayInterface.h

@@ -94,8 +94,6 @@ private:
 
     bool _isInMarketplaceInspectionMode { false };
 
-    void openInspectionCertificate();
-    void openMarketplace();
     void enableEntityHighlight(const EntityItemID& entityItemID);
     void disableEntityHighlight(const EntityItemID& entityItemID);
 

libraries/animation/src/AnimStateMachine.cpp

@@ -88,6 +88,10 @@ const AnimPoseVec& AnimStateMachine::evaluate(const AnimVariantMap& animVars, co
     processOutputJoints(triggersOut);
 
     context.addStateMachineInfo(_id, _currentState->getID(), _previousState->getID(), _duringInterp, _alpha);
+    if (_duringInterp) {
+        // hack: add previoius state to debug alpha map, with parens around it's name.
+        context.setDebugAlpha(QString("(%1)").arg(_previousState->getID()), 1.0f - _alpha, AnimNodeType::Clip);
+    }
 
     return _poses;
 }

libraries/animation/src/AnimVariant.cpp

@@ -140,14 +140,19 @@ std::map<QString, QString> AnimVariantMap::toDebugMap() const {
             result[pair.first] = QString::number(pair.second.getFloat(), 'f', 3);
             break;
         case AnimVariant::Type::Vec3: {
+            // To prevent filling up debug stats, don't show vec3 values
+            /*
             glm::vec3 value = pair.second.getVec3();
             result[pair.first] = QString("(%1, %2, %3)").
                 arg(QString::number(value.x, 'f', 3)).
                 arg(QString::number(value.y, 'f', 3)).
                 arg(QString::number(value.z, 'f', 3));
+            */
             break;
         }
         case AnimVariant::Type::Quat: {
+            // To prevent filling up the anim stats, don't show quat values
+            /*
             glm::quat value = pair.second.getQuat();
             result[pair.first] = QString("(%1, %2, %3, %4)").
                 arg(QString::number(value.x, 'f', 3)).
@@ -155,10 +160,14 @@ std::map<QString, QString> AnimVariantMap::toDebugMap() const {
                 arg(QString::number(value.z, 'f', 3)).
                 arg(QString::number(value.w, 'f', 3));
             break;
+            */
         }
         case AnimVariant::Type::String:
+            // To prevent filling up anim stats, don't show string values
+            /*
             result[pair.first] = pair.second.getString();
             break;
+            */
         default:
             assert(("invalid AnimVariant::Type", false));
         }

libraries/audio-client/src/AudioClient.cpp

@@ -53,7 +53,6 @@
 #include "AudioHelpers.h"
 
 #if defined(Q_OS_ANDROID)
-#define VOICE_RECOGNITION "voicerecognition"
 #include <QtAndroidExtras/QAndroidJniObject>
 #endif
 
@@ -210,6 +209,7 @@ AudioClient::AudioClient() :
     _positionGetter(DEFAULT_POSITION_GETTER),
 #if defined(Q_OS_ANDROID)
     _checkInputTimer(this),
+    _isHeadsetPluggedIn(false),
 #endif
     _orientationGetter(DEFAULT_ORIENTATION_GETTER) {
     // avoid putting a lock in the device callback
@@ -461,9 +461,14 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
 
 #if defined (Q_OS_ANDROID)
     if (mode == QAudio::AudioInput) {
+        Setting::Handle<bool> enableAEC(SETTING_AEC_KEY, false);
+        bool aecEnabled = enableAEC.get();
+        auto audioClient = DependencyManager::get<AudioClient>();
+        bool headsetOn = audioClient? audioClient->isHeadsetPluggedIn() : false;
         auto inputDevices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
         for (auto inputDevice : inputDevices) {
-            if (inputDevice.deviceName() == VOICE_RECOGNITION) {
+            if (((headsetOn || !aecEnabled) && inputDevice.deviceName() == VOICE_RECOGNITION) ||
+                    ((!headsetOn && aecEnabled) && inputDevice.deviceName() == VOICE_COMMUNICATION)) {
                 return inputDevice;
             }
         }
@@ -1640,6 +1645,29 @@ void AudioClient::checkInputTimeout() {
 #endif
 }
 
+void AudioClient::setHeadsetPluggedIn(bool pluggedIn) {
+#if defined(Q_OS_ANDROID)
+    if (pluggedIn == !_isHeadsetPluggedIn && !_inputDeviceInfo.isNull()) {
+        QAndroidJniObject brand =  QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "BRAND");
+        // some samsung phones needs more time to shutdown the previous input device
+        if (brand.toString().contains("samsung", Qt::CaseInsensitive)) {
+            switchInputToAudioDevice(QAudioDeviceInfo(), true);
+            QThread::msleep(200);
+        }
+
+        Setting::Handle<bool> enableAEC(SETTING_AEC_KEY, false);
+        bool aecEnabled = enableAEC.get();
+
+        if ((pluggedIn || !aecEnabled) && _inputDeviceInfo.deviceName() != VOICE_RECOGNITION) {
+            switchAudioDevice(QAudio::AudioInput, VOICE_RECOGNITION);
+        } else if (!pluggedIn && aecEnabled && _inputDeviceInfo.deviceName() != VOICE_COMMUNICATION) {
+            switchAudioDevice(QAudio::AudioInput, VOICE_COMMUNICATION);
+        }
+    }
+    _isHeadsetPluggedIn = pluggedIn;
+#endif
+}
+
 void AudioClient::outputNotify() {
     int recentUnfulfilled = _audioOutputIODevice.getRecentUnfulfilledReads();
     if (recentUnfulfilled > 0) {

libraries/audio-client/src/AudioClient.h

@@ -64,6 +64,13 @@
 #pragma warning( pop )
 #endif
 
+#if defined (Q_OS_ANDROID)
+#define VOICE_RECOGNITION "voicerecognition"
+#define VOICE_COMMUNICATION "voicecommunication"
+
+#define SETTING_AEC_KEY "Android/aec"
+#endif
+
 class QAudioInput;
 class QAudioOutput;
 class QIODevice;
@@ -169,6 +176,10 @@ public:
     static QString getWinDeviceName(wchar_t* guid);
 #endif
 
+#if defined(Q_OS_ANDROID)
+    bool isHeadsetPluggedIn() { return _isHeadsetPluggedIn; }
+#endif
+
 public slots:
     void start();
     void stop();
@@ -217,6 +228,9 @@ public slots:
     bool switchAudioDevice(QAudio::Mode mode, const QAudioDeviceInfo& deviceInfo = QAudioDeviceInfo());
     bool switchAudioDevice(QAudio::Mode mode, const QString& deviceName);
 
+    // Qt opensles plugin is not able to detect when the headset is plugged in
+    void setHeadsetPluggedIn(bool pluggedIn);
+
     float getInputVolume() const { return (_audioInput) ? (float)_audioInput->volume() : 0.0f; }
     void setInputVolume(float volume, bool emitSignal = true);
     void setReverb(bool reverb);
@@ -278,6 +292,7 @@ private:
 #ifdef Q_OS_ANDROID
     QTimer _checkInputTimer;
     long _inputReadsSinceLastCheck = 0l;
+    bool _isHeadsetPluggedIn;
 #endif
 
     class Gate {

libraries/avatars/src/AvatarData.cpp

@@ -2829,8 +2829,10 @@ void RayToAvatarIntersectionResultFromScriptValue(const QScriptValue& object, Ra
     value.extraInfo = object.property("extraInfo").toVariant().toMap();
 }
 
+// these coefficients can be changed via JS for experimental tuning
+// use AvatatManager.setAvatarSortCoefficient("name", value) by a user with domain kick-rights
 float AvatarData::_avatarSortCoefficientSize { 8.0f };
-float AvatarData::_avatarSortCoefficientCenter { 4.0f };
+float AvatarData::_avatarSortCoefficientCenter { 0.25f };
 float AvatarData::_avatarSortCoefficientAge { 1.0f };
 
 QScriptValue AvatarEntityMapToScriptValue(QScriptEngine* engine, const AvatarEntityMap& value) {

libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp

@@ -187,12 +187,10 @@ ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createPa
     particle.basePosition = baseTransform.getTranslation();
 
     // Position, velocity, and acceleration
+    glm::vec3 emitDirection;
     if (polarStart == 0.0f && polarFinish == 0.0f && emitDimensions.z == 0.0f) {
         // Emit along z-axis from position
-
+        emitDirection = Vectors::UNIT_Z;
-        particle.velocity = (emitSpeed + randFloatInRange(-1.0f, 1.0f) * speedSpread) * (emitOrientation * Vectors::UNIT_Z);
-        particle.acceleration = emitAcceleration + randFloatInRange(-1.0f, 1.0f) * accelerationSpread;
-
     } else {
         // Emit around point or from ellipsoid
         // - Distribute directions evenly around point
@@ -210,7 +208,6 @@ ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createPa
             azimuth = azimuthStart + (TWO_PI + azimuthFinish - azimuthStart) * randFloat();
         }
 
-        glm::vec3 emitDirection;
         if (emitDimensions == Vectors::ZERO) {
             // Point
             emitDirection = glm::quat(glm::vec3(PI_OVER_TWO - elevation, 0.0f, azimuth)) * Vectors::UNIT_Z;
@@ -235,10 +232,10 @@ ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createPa
             ));
             particle.relativePosition += emitOrientation * emitPosition;
         }
-
-        particle.velocity = (emitSpeed + randFloatInRange(-1.0f, 1.0f) * speedSpread) * (emitOrientation * emitDirection);
-        particle.acceleration = emitAcceleration + randFloatInRange(-1.0f, 1.0f) * accelerationSpread;
     }
+    particle.velocity = (emitSpeed + randFloatInRange(-1.0f, 1.0f) * speedSpread) * (emitOrientation * emitDirection);
+    particle.acceleration = emitAcceleration +
+        glm::vec3(randFloatInRange(-1.0f, 1.0f), randFloatInRange(-1.0f, 1.0f), randFloatInRange(-1.0f, 1.0f)) * accelerationSpread;
 
     return particle;
 }

libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp

@@ -57,7 +57,7 @@ void GL41Backend::postLinkProgram(ShaderObject& programObject, const Shader& pro
         const auto resourceBufferUniforms = ::gl::Uniform::loadByName(glprogram, program.getResourceBuffers().getNames());
         for (const auto& resourceBuffer : resourceBufferUniforms) {
             const auto& targetBinding = expectedResourceBuffers.at(resourceBuffer.name);
-            glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding);
+            glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding + GL41Backend::RESOURCE_BUFFER_SLOT0_TEX_UNIT);
         }
     }
 

libraries/networking/src/AccountManager.cpp

@@ -538,7 +538,6 @@ void AccountManager::requestAccessToken(const QString& login, const QString& pas
 
     QNetworkReply* requestReply = networkAccessManager.post(request, postData);
     connect(requestReply, &QNetworkReply::finished, this, &AccountManager::requestAccessTokenFinished);
-    connect(requestReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestAccessTokenError(QNetworkReply::NetworkError)));
 }
 
 void AccountManager::requestAccessTokenWithSteam(QByteArray authSessionTicket) {
@@ -633,12 +632,6 @@ void AccountManager::requestAccessTokenFinished() {
     }
 }
 
-void AccountManager::requestAccessTokenError(QNetworkReply::NetworkError error) {
-    // TODO: error handling
-    qCDebug(networking) << "AccountManager: failed to fetch access token - " << error;
-    emit loginFailed();
-}
-
 void AccountManager::refreshAccessTokenFinished() {
     QNetworkReply* requestReply = reinterpret_cast<QNetworkReply*>(sender());
 

libraries/networking/src/AccountManager.h

@@ -106,7 +106,6 @@ public slots:
     void requestAccessTokenFinished();
     void refreshAccessTokenFinished();
     void requestProfileFinished();
-    void requestAccessTokenError(QNetworkReply::NetworkError error);
     void refreshAccessTokenError(QNetworkReply::NetworkError error);
     void requestProfileError(QNetworkReply::NetworkError error);
     void logout();

libraries/render-utils/src/Highlight.slh

@@ -15,7 +15,7 @@
 
 <@include Highlight_shared.slh@>
 
-layout(binding=RENDER_UTILS_BUFFER_HIGHLIGHT_PARAMS) uniform highlightParamsBuffer {
+layout(std140, binding=RENDER_UTILS_BUFFER_HIGHLIGHT_PARAMS) uniform highlightParamsBuffer {
     HighlightParameters params;
 };
 

libraries/render-utils/src/Highlight_aabox.slv

@@ -45,7 +45,7 @@ struct HighlightParameters {
     vec2 outlineWidth;
 };
 
-layout(binding=0) uniform parametersBuffer {
+layout(std140, binding=0) uniform parametersBuffer {
     HighlightParameters _parameters;
 };
 

libraries/render-utils/src/Model.cpp

@@ -1553,14 +1553,13 @@ void Model::setBlendedVertices(int blendNumber, const QVector<glm::vec3>& vertic
     for (int i = 0; i < fbxGeometry.meshes.size(); i++) {
         const FBXMesh& mesh = fbxGeometry.meshes.at(i);
         auto meshNormalsAndTangents = _normalsAndTangents.find(i);
-        if (mesh.blendshapes.isEmpty() || meshNormalsAndTangents == _normalsAndTangents.end()) {
+        const auto& buffer = _blendedVertexBuffers.find(i);
+        if (mesh.blendshapes.isEmpty() || meshNormalsAndTangents == _normalsAndTangents.end() || buffer == _blendedVertexBuffers.end()) {
             continue;
         }
 
         const auto vertexCount = mesh.vertices.size();
         const auto verticesSize = vertexCount * sizeof(glm::vec3);
-        const auto& buffer = _blendedVertexBuffers.find(i);
-        assert(buffer != _blendedVertexBuffers.end());
         buffer->second->resize(mesh.vertices.size() * sizeof(glm::vec3) + meshNormalsAndTangents->second.size() * sizeof(NormalType));
         buffer->second->setSubData(0, verticesSize, (gpu::Byte*) vertices.constData() + index * sizeof(glm::vec3));
         buffer->second->setSubData(verticesSize, meshNormalsAndTangents->second.size() * sizeof(NormalType), (const gpu::Byte*) normalsAndTangents.data() + normalAndTangentIndex * sizeof(NormalType));

libraries/render-utils/src/parabola_translucent.slf

@@ -0,0 +1,18 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Created by Sam Gondelman on 9/10/2018
+//  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 DeferredBufferWrite.slh@>
+
+layout(location=0) in vec4 _color;
+
+void main(void) {
+    packDeferredFragmentTranslucent(vec3(1.0, 0.0, 0.0), _color.a, _color.rgb, DEFAULT_FRESNEL, DEFAULT_ROUGHNESS);
+}

libraries/render-utils/src/render-utils/parabola_translucent.slp

@@ -0,0 +1 @@
+VERTEX parabola

scripts/modules/appUi.js

@@ -1,5 +1,5 @@
 "use strict";
-/*global Tablet, Script*/
+/* global Tablet, Script */
 //
 //  libraries/appUi.js
 //
@@ -11,6 +11,7 @@
 //
 
 function AppUi(properties) {
+    var request = Script.require('request').request;
     /* Example development order:
        1. var AppUi = Script.require('appUi');
        2. Put appname-i.svg, appname-a.svg in graphicsDirectory (where non-default graphicsDirectory can be added in #3).
@@ -31,37 +32,63 @@ function AppUi(properties) {
     var that = this;
     function defaultButton(name, suffix) {
         var base = that[name] || (that.buttonPrefix + suffix);
-        that[name] = (base.indexOf('/') >= 0) ? base : (that.graphicsDirectory + base); //poor man's merge
+        that[name] = (base.indexOf('/') >= 0) ? base : (that.graphicsDirectory + base); // poor man's merge
     }
 
     // Defaults:
     that.tabletName = "com.highfidelity.interface.tablet.system";
     that.inject = "";
     that.graphicsDirectory = "icons/tablet-icons/"; // Where to look for button svgs. See below.
+    that.additionalAppScreens = [];
     that.checkIsOpen = function checkIsOpen(type, tabletUrl) { // Are we active? Value used to set isOpen.
-        return (type === that.type) && that.currentUrl && (tabletUrl.indexOf(that.currentUrl) >= 0); // Actual url may have prefix or suffix.
+        // Actual url may have prefix or suffix.
+        return (type === that.currentVisibleScreenType) &&
+            that.currentVisibleUrl &&
+            ((that.home.indexOf(that.currentVisibleUrl) > -1) ||
+            (that.additionalAppScreens.indexOf(that.currentVisibleUrl) > -1));
     };
-    that.setCurrentData = function setCurrentData(url) {
+    that.setCurrentVisibleScreenMetadata = function setCurrentVisibleScreenMetadata(type, url) {
-        that.currentUrl = url;
+        that.currentVisibleScreenType = type;
-        that.type = /.qml$/.test(url) ? 'QML' : 'Web';
+        that.currentVisibleUrl = url;
-    }
+    };
-    that.open = function open(optionalUrl) { // How to open the app.
+    that.open = function open(optionalUrl, optionalInject) { // How to open the app.
         var url = optionalUrl || that.home;
-        that.setCurrentData(url);
+        var inject = optionalInject || that.inject;
-        if (that.isQML()) {
+
+        if (that.isQMLUrl(url)) {
             that.tablet.loadQMLSource(url);
         } else {
-            that.tablet.gotoWebScreen(url, that.inject);
+            that.tablet.gotoWebScreen(url, inject);
+        }
+    };
+    // Opens some app on top of the current app (on desktop, opens new window)
+    that.openNewAppOnTop = function openNewAppOnTop(url, optionalInject) {
+        var inject = optionalInject || "";
+        if (that.isQMLUrl(url)) {
+            that.tablet.loadQMLOnTop(url);
+        } else {
+            that.tablet.loadWebScreenOnTop(url, inject);
         }
     };
     that.close = function close() { // How to close the app.
-        that.currentUrl = "";
+        that.currentVisibleUrl = "";
         // for toolbar-mode: go back to home screen, this will close the window.
         that.tablet.gotoHomeScreen();
     };
     that.buttonActive = function buttonActive(isActive) { // How to make the button active (white).
         that.button.editProperties({isActive: isActive});
     };
+    that.isQMLUrl = function isQMLUrl(url) {
+        var type = /.qml$/.test(url) ? 'QML' : 'Web';
+        return type === 'QML';
+    };
+    that.isCurrentlyOnQMLScreen = function isCurrentlyOnQMLScreen() {
+        return that.currentVisibleScreenType === 'QML';
+    };
+
+    //
+    // START Notification Handling Defaults
+    //
     that.messagesWaiting = function messagesWaiting(isWaiting) { // How to indicate a message light on button.
         // Note that waitingButton doesn't have to exist unless someone explicitly calls this with isWaiting true.
         that.button.editProperties({
@@ -69,16 +96,124 @@ function AppUi(properties) {
             activeIcon: isWaiting ? that.activeMessagesButton : that.activeButton
         });
     };
-    that.isQML = function isQML() { // We set type property in onClick.
+    that.notificationPollTimeout = false;
-        return that.type === 'QML';
+    that.notificationPollTimeoutMs = 60000;
+    that.notificationPollEndpoint = false;
+    that.notificationPollStopPaginatingConditionMet = false;
+    that.notificationDataProcessPage = function (data) {
+        return data;
     };
-    that.eventSignal = function eventSignal() { // What signal to hook onMessage to.
+    that.notificationPollCallback = that.ignore;
-        return that.isQML() ? that.tablet.fromQml : that.tablet.webEventReceived;
+    that.notificationPollCaresAboutSince = false;
+    that.notificationInitialCallbackMade = false;
+    that.notificationDisplayBanner = function (message) {
+        Window.displayAnnouncement(message);
+    };
+    //
+    // END Notification Handling Defaults
+    //
+
+    // Handlers
+    that.onScreenChanged = function onScreenChanged(type, url) {
+        // Set isOpen, wireEventBridge, set buttonActive as appropriate,
+        // and finally call onOpened() or onClosed() IFF defined.
+        that.setCurrentVisibleScreenMetadata(type, url);
+        if (that.checkIsOpen(type, url)) {
+            that.wireEventBridge(true);
+            if (!that.isOpen) {
+                that.buttonActive(true);
+                if (that.onOpened) {
+                    that.onOpened();
+                }
+                that.isOpen = true;
+            }
+        } else { // Not us.  Should we do something for type Home, Menu, and particularly Closed (meaning tablet hidden?
+            that.wireEventBridge(false);
+            if (that.isOpen) {
+                that.buttonActive(false);
+                if (that.onClosed) {
+                    that.onClosed();
+                }
+                that.isOpen = false;
+            }
+        }
+        console.debug(that.buttonName + " app reports: Tablet screen changed.\nNew screen type: " + type +
+            "\nNew screen URL: " + url + "\nCurrent app open status: " + that.isOpen + "\n");
     };
 
     // Overwrite with the given properties:
     Object.keys(properties).forEach(function (key) { that[key] = properties[key]; });
 
+    //
+    // START Notification Handling
+    //
+    var METAVERSE_BASE = Account.metaverseServerURL;
+    var currentDataPageToRetrieve = 1;
+    var concatenatedServerResponse = new Array();
+    that.notificationPoll = function () {
+        if (!that.notificationPollEndpoint) {
+            return;
+        }
+
+        // User is "appearing offline"
+        if (GlobalServices.findableBy === "none") {
+            that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
+            return;
+        }
+
+        var url = METAVERSE_BASE + that.notificationPollEndpoint;
+
+        if (that.notificationPollCaresAboutSince) {
+            url = url + "&since=" + (new Date().getTime());
+        }
+
+        console.debug(that.buttonName, 'polling for notifications at endpoint', url);
+
+        function requestCallback(error, response) {
+            if (error || (response.status !== 'success')) {
+                print("Error: unable to get", url, error || response.status);
+                that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
+                return;
+            }
+
+            if (!that.notificationPollStopPaginatingConditionMet || that.notificationPollStopPaginatingConditionMet(response)) {
+                that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
+
+                var notificationData;
+                if (concatenatedServerResponse.length) {
+                    notificationData = concatenatedServerResponse;
+                } else {
+                    notificationData = that.notificationDataProcessPage(response);
+                }
+                console.debug(that.buttonName, 'notification data for processing:', JSON.stringify(notificationData));
+                that.notificationPollCallback(notificationData);
+                that.notificationInitialCallbackMade = true;
+                currentDataPageToRetrieve = 1;
+                concatenatedServerResponse = new Array();
+            } else {
+                concatenatedServerResponse = concatenatedServerResponse.concat(that.notificationDataProcessPage(response));
+                currentDataPageToRetrieve++;
+                request({ uri: (url + "&page=" + currentDataPageToRetrieve) }, requestCallback);
+            }
+        }
+
+        request({ uri: url }, requestCallback);
+    };
+
+    // This won't do anything if there isn't a notification endpoint set
+    that.notificationPoll();
+
+    function availabilityChanged() {
+        if (that.notificationPollTimeout) {
+            Script.clearTimeout(that.notificationPollTimeout);
+            that.notificationPollTimeout = false;
+        }
+        that.notificationPoll();
+    }
+    //
+    // END Notification Handling
+    //
+
     // Properties:
     that.tablet = Tablet.getTablet(that.tabletName);
     // Must be after we gather properties.
@@ -100,65 +235,58 @@ function AppUi(properties) {
     }
     that.button = that.tablet.addButton(buttonOptions);
     that.ignore = function ignore() { };
-
+    that.hasOutboundEventBridge = false;
-    // Handlers
+    that.hasInboundQmlEventBridge = false;
-    that.onScreenChanged = function onScreenChanged(type, url) {
+    that.hasInboundHtmlEventBridge = false;
-        // Set isOpen, wireEventBridge, set buttonActive as appropriate,
-        // and finally call onOpened() or onClosed() IFF defined.
-        console.debug(that.buttonName, 'onScreenChanged', type, url, that.isOpen);
-        if (that.checkIsOpen(type, url)) {
-            if (!that.isOpen) {
-                that.wireEventBridge(true);
-                that.buttonActive(true);
-                if (that.onOpened) {
-                    that.onOpened();
-                }
-                that.isOpen = true;
-            }
-
-        } else { // Not us.  Should we do something for type Home, Menu, and particularly Closed (meaning tablet hidden?
-            if (that.isOpen) {
-                that.wireEventBridge(false);
-                that.buttonActive(false);
-                if (that.onClosed) {
-                    that.onClosed();
-                }
-                that.isOpen = false;
-            }
-        }
-    };
-    that.hasEventBridge = false;
     // HTML event bridge uses strings, not objects. Here we abstract over that.
     // (Although injected javascript still has to use JSON.stringify/JSON.parse.)
-    that.sendToHtml = function (messageObject) { that.tablet.emitScriptEvent(JSON.stringify(messageObject)); };
+    that.sendToHtml = function (messageObject) {
-    that.fromHtml = function (messageString) { that.onMessage(JSON.parse(messageString)); };
+        that.tablet.emitScriptEvent(JSON.stringify(messageObject));
+    };
+    that.fromHtml = function (messageString) {
+        var parsedMessage = JSON.parse(messageString);
+        parsedMessage.messageSrc = "HTML";
+        that.onMessage(parsedMessage);
+    };
     that.sendMessage = that.ignore;
     that.wireEventBridge = function wireEventBridge(on) {
         // Uniquivocally sets that.sendMessage(messageObject) to do the right thing.
-        // Sets hasEventBridge and wires onMessage to eventSignal as appropriate, IFF onMessage defined.
+        // Sets has*EventBridge and wires onMessage to the proper event bridge as appropriate, IFF onMessage defined.
-        var handler, isQml = that.isQML();
+        var isCurrentlyOnQMLScreen = that.isCurrentlyOnQMLScreen();
         // Outbound (always, regardless of whether there is an inbound handler).
         if (on) {
-            that.sendMessage = isQml ? that.tablet.sendToQml : that.sendToHtml;
+            that.sendMessage = isCurrentlyOnQMLScreen ? that.tablet.sendToQml : that.sendToHtml;
+            that.hasOutboundEventBridge = true;
         } else {
             that.sendMessage = that.ignore;
+            that.hasOutboundEventBridge = false;
         }
 
-        if (!that.onMessage) { return; }
+        if (!that.onMessage) {
+            return;
+        }
 
         // Inbound
-        handler = isQml ? that.onMessage : that.fromHtml;
         if (on) {
-            if (!that.hasEventBridge) {
+            if (isCurrentlyOnQMLScreen && !that.hasInboundQmlEventBridge) {
-                console.debug(that.buttonName, 'connecting', that.eventSignal());
+                console.debug(that.buttonName, 'connecting', that.tablet.fromQml);
-                that.eventSignal().connect(handler);
+                that.tablet.fromQml.connect(that.onMessage);
-                that.hasEventBridge = true;
+                that.hasInboundQmlEventBridge = true;
+            } else if (!isCurrentlyOnQMLScreen && !that.hasInboundHtmlEventBridge) {
+                console.debug(that.buttonName, 'connecting', that.tablet.webEventReceived);
+                that.tablet.webEventReceived.connect(that.fromHtml);
+                that.hasInboundHtmlEventBridge = true;
             }
         } else {
-            if (that.hasEventBridge) {
+            if (that.hasInboundQmlEventBridge) {
-                console.debug(that.buttonName, 'disconnecting', that.eventSignal());
+                console.debug(that.buttonName, 'disconnecting', that.tablet.fromQml);
-                that.eventSignal().disconnect(handler);
+                that.tablet.fromQml.disconnect(that.onMessage);
-                that.hasEventBridge = false;
+                that.hasInboundQmlEventBridge = false;
+            }
+            if (that.hasInboundHtmlEventBridge) {
+                console.debug(that.buttonName, 'disconnecting', that.tablet.webEventReceived);
+                that.tablet.webEventReceived.disconnect(that.fromHtml);
+                that.hasInboundHtmlEventBridge = false;
             }
         }
     };
@@ -175,6 +303,7 @@ function AppUi(properties) {
         } : that.ignore;
     that.onScriptEnding = function onScriptEnding() {
         // Close if necessary, clean up any remaining handlers, and remove the button.
+        GlobalServices.findableByChanged.disconnect(availabilityChanged);
         if (that.isOpen) {
             that.close();
         }
@@ -185,10 +314,15 @@ function AppUi(properties) {
             }
             that.tablet.removeButton(that.button);
         }
+        if (that.notificationPollTimeout) {
+            Script.clearInterval(that.notificationPollTimeout);
+            that.notificationPollTimeout = false;
+        }
     };
     // Set up the handlers.
     that.tablet.screenChanged.connect(that.onScreenChanged);
     that.button.clicked.connect(that.onClicked);
     Script.scriptEnding.connect(that.onScriptEnding);
+    GlobalServices.findableByChanged.connect(availabilityChanged);
 }
 module.exports = AppUi;

scripts/system/edit.js

@@ -2134,9 +2134,7 @@ var PropertiesTool = function (opts) {
     var onWebEventReceived = function(data) {
         try {
             data = JSON.parse(data);
-        }
+        } catch(e) {
-        catch(e) {
-            print('Edit.js received web event that was not valid json.');
             return;
         }
         var i, properties, dY, diff, newPosition;

scripts/system/help.js

@@ -1,5 +1,5 @@
 "use strict";
-
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 //  help.js
 //  scripts/system/
@@ -12,50 +12,18 @@
 //
 /* globals Tablet, Script, HMD, Controller, Menu */
 
-(function() { // BEGIN LOCAL_SCOPE
+(function () { // BEGIN LOCAL_SCOPE
+var AppUi = Script.require('appUi');
 
-    var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
+var HELP_URL = Script.resourcesPath() + "html/tabletHelp.html";
-    var HELP_URL = Script.resourcesPath() + "html/tabletHelp.html";
+var HELP_BUTTON_NAME = "HELP";
-    var buttonName = "HELP";
+var ui;
-    var onHelpScreen = false;
+function startup() {
-    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    ui = new AppUi({
-    var button = tablet.addButton({
+        buttonName: HELP_BUTTON_NAME,
-        icon: "icons/tablet-icons/help-i.svg",
+        sortOrder: 6,
-        activeIcon: "icons/tablet-icons/help-a.svg",
+        home: HELP_URL
-        text: buttonName,
-        sortOrder: 6
     });
-
+}
-    var enabled = false;
+startup();
-    function onClicked() {
-        if (onHelpScreen) {
-            tablet.gotoHomeScreen();
-        } else {
-            if (HMD.tabletID) {
-                Entities.editEntity(HMD.tabletID, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
-            }
-            Menu.triggerOption('Help...');
-            onHelpScreen = true;
-        }
-    }
-
-    function onScreenChanged(type, url) {
-        onHelpScreen = type === "Web" && (url.indexOf(HELP_URL) === 0);
-        button.editProperties({ isActive: onHelpScreen });
-    }
-
-    button.clicked.connect(onClicked);
-    tablet.screenChanged.connect(onScreenChanged);
-
-    Script.scriptEnding.connect(function () {
-        if (onHelpScreen) {
-            tablet.gotoHomeScreen();
-        }
-        button.clicked.disconnect(onClicked);
-        tablet.screenChanged.disconnect(onScreenChanged);
-        if (tablet) {
-            tablet.removeButton(button);
-        }
-    });
-
 }()); // END LOCAL_SCOPE

scripts/system/html/js/entityList.js

@@ -27,8 +27,11 @@ const COMPARE_ASCENDING = function(a, b) {
         return -1;
     }  else if (va > vb) {
         return 1;
+    } else if (a.id < b.id) {
+        return -1;
     }
-    return 0;
+
+    return 1;
 }
 const COMPARE_DESCENDING = function(a, b) {
     return COMPARE_ASCENDING(b, a);
@@ -161,7 +164,10 @@ function loaded() {
 
             selectedEntities.forEach(function(entityID) {
                 if (selection.indexOf(entityID) === -1) {
-                    entitiesByID[entityID].el.className = '';
+                    let entity = entitiesByID[entityID];
+                    if (entity !== undefined) {
+                        entity.el.className = '';
+                    }
                 }
             });
 
@@ -223,15 +229,15 @@ function loaded() {
                         type: type,
                         url: filename,
                         fullUrl: entity.url,
-                        locked: entity.locked ? LOCKED_GLYPH : null,
+                        locked: entity.locked,
-                        visible: entity.visible ? VISIBLE_GLYPH : null,
+                        visible: entity.visible,
-                        verticesCount: displayIfNonZero(entity.verticesCount),
+                        verticesCount: entity.verticesCount,
-                        texturesCount: displayIfNonZero(entity.texturesCount),
+                        texturesCount: entity.texturesCount,
-                        texturesSize: decimalMegabytes(entity.texturesSize),
+                        texturesSize: entity.texturesSize,
-                        hasTransparent: entity.hasTransparent ? TRANSPARENCY_GLYPH : null,
+                        hasTransparent: entity.hasTransparent,
-                        isBaked: entity.isBaked ? BAKED_GLYPH : null,
+                        isBaked: entity.isBaked,
-                        drawCalls: displayIfNonZero(entity.drawCalls),
+                        drawCalls: entity.drawCalls,
-                        hasScript: entity.hasScript ? SCRIPT_GLYPH : null,
+                        hasScript: entity.hasScript,
                     }
 
                     entities.push(entityData);
@@ -259,15 +265,15 @@ function loaded() {
                     addColumn('type', entity.type);
                     addColumn('name', entity.name);
                     addColumn('url', entity.url);
-                    addColumnHTML('locked glyph', entity.locked);
+                    addColumnHTML('locked glyph', entity.locked ? LOCKED_GLYPH : null);
-                    addColumnHTML('visible glyph', entity.visible);
+                    addColumnHTML('visible glyph', entity.visible ? VISIBLE_GLYPH : null);
-                    addColumn('verticesCount', entity.verticesCount);
+                    addColumn('verticesCount', displayIfNonZero(entity.verticesCount));
-                    addColumn('texturesCount', entity.texturesCount);
+                    addColumn('texturesCount', displayIfNonZero(entity.texturesCount));
-                    addColumn('texturesSize', entity.texturesSize);
+                    addColumn('texturesSize', decimalMegabytes(entity.texturesSize));
-                    addColumnHTML('hasTransparent glyph', entity.hasTransparent);
+                    addColumnHTML('hasTransparent glyph', entity.hasTransparent ? TRANSPARENCY_GLYPH : null);
-                    addColumnHTML('isBaked glyph', entity.isBaked);
+                    addColumnHTML('isBaked glyph', entity.isBaked ? BAKED_GLYPH : null);
-                    addColumn('drawCalls', entity.drawCalls);
+                    addColumn('drawCalls', displayIfNonZero(entity.drawCalls));
-                    addColumn('hasScript glyph', entity.hasScript);
+                    addColumn('hasScript glyph', entity.hasScript ? SCRIPT_GLYPH : null);
                     row.addEventListener('click', onRowClicked);
                     row.addEventListener('dblclick', onRowDoubleClicked);
 
@@ -385,15 +391,18 @@ function loaded() {
             let notFound = false;
 
             selectedEntities.forEach(function(id) {
-                entitiesByID[id].el.className = '';
+                let entity = entitiesByID[id];
+                if (entity !== undefined) {
+                    entity.el.className = '';
+                }
             });
 
             selectedEntities = [];
             for (let i = 0; i < selectedIDs.length; i++) {
                 let id = selectedIDs[i];
                 selectedEntities.push(id);
-                if (id in entitiesByID) {
+                let entity = entitiesByID[id];
-                    let entity = entitiesByID[id];
+                if (entity !== undefined) {
                     entity.el.className = 'selected';
                 } else {
                     notFound = true;

scripts/system/html/js/marketplacesInject.js

@@ -1,3 +1,5 @@
+/* global $, window, MutationObserver */
+
 //
 //  marketplacesInject.js
 //
@@ -11,7 +13,6 @@
 //
 
 (function () {
-
     // Event bridge messages.
     var CLARA_IO_DOWNLOAD = "CLARA.IO DOWNLOAD";
     var CLARA_IO_STATUS = "CLARA.IO STATUS";
@@ -24,7 +25,7 @@
 
     var canWriteAssets = false;
     var xmlHttpRequest = null;
-    var isPreparing = false;  // Explicitly track download request status.
+    var isPreparing = false; // Explicitly track download request status.
 
     var commerceMode = false;
     var userIsLoggedIn = false;
@@ -33,7 +34,6 @@
     var messagesWaiting = false;
 
     function injectCommonCode(isDirectoryPage) {
-
         // Supporting styles from marketplaces.css.
         // Glyph font family, size, and spacing adjusted because HiFi-Glyphs cannot be used cross-domain.
         $("head").append(
@@ -74,7 +74,9 @@
             (document.referrer !== "") ? window.history.back() : window.location = (marketplaceBaseURL + "/marketplace?");
         });
         $("#all-markets").on("click", function () {
-            EventBridge.emitWebEvent(GOTO_DIRECTORY);
+            EventBridge.emitWebEvent(JSON.stringify({
+                type: GOTO_DIRECTORY
+            }));
         });
     }
 
@@ -94,11 +96,11 @@
         });
     }
 
-    emitWalletSetupEvent = function() {
+    var emitWalletSetupEvent = function () {
         EventBridge.emitWebEvent(JSON.stringify({
             type: "WALLET_SETUP"
         }));
-    }
+    };
 
     function maybeAddSetupWalletButton() {
         if (!$('body').hasClass("walletsetup-injected") && userIsLoggedIn && walletNeedsSetup) {
@@ -285,7 +287,7 @@
             $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
             $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
 
-            var priceElement = $(this).find('.price')
+            var priceElement = $(this).find('.price');
             priceElement.css({
                 "padding": "3px 5px",
                 "height": "40px",
@@ -355,12 +357,12 @@
     function injectAddScrollbarToCategories() {
         $('#categories-dropdown').on('show.bs.dropdown', function () {
             $('body > div.container').css('display', 'none')
-            $('#categories-dropdown > ul.dropdown-menu').css({ 'overflow': 'auto', 'height': 'calc(100vh - 110px)' })
+            $('#categories-dropdown > ul.dropdown-menu').css({ 'overflow': 'auto', 'height': 'calc(100vh - 110px)' });
         });
 
         $('#categories-dropdown').on('hide.bs.dropdown', function () {
-            $('body > div.container').css('display', '')
+            $('body > div.container').css('display', '');
-            $('#categories-dropdown > ul.dropdown-menu').css({ 'overflow': '', 'height': '' })
+            $('#categories-dropdown > ul.dropdown-menu').css({ 'overflow': '', 'height': '' });
         });
     }
 
@@ -382,7 +384,6 @@
                     mutations.forEach(function (mutation) {
                         injectBuyButtonOnMainPage();
                     });
-                    //observer.disconnect();
                 });
                 var config = { attributes: true, childList: true, characterData: true };
                 observer.observe(target, config);
@@ -451,8 +452,8 @@
                             "itemPage",
                             urlParams.get('edition'),
                             type);
-                        }
+                    }
-                    });
+                });
                 maybeAddPurchasesButton();
             }
         }
@@ -503,127 +504,142 @@
                 $(".top-title .col-sm-4").append(downloadContainer);
                 downloadContainer.append(downloadFBX);
             }
+        }
+    }
 
-            // Automatic download to High Fidelity.
+    // Automatic download to High Fidelity.
-            function startAutoDownload() {
+    function startAutoDownload() {
+        // One file request at a time.
+        if (isPreparing) {
+            console.log("WARNING: Clara.io FBX: Prepare only one download at a time");
+            return;
+        }
 
-                // One file request at a time.
+        // User must be able to write to Asset Server.
-                if (isPreparing) {
+        if (!canWriteAssets) {
-                    console.log("WARNING: Clara.io FBX: Prepare only one download at a time");
+            console.log("ERROR: Clara.io FBX: File download cancelled because no permissions to write to Asset Server");
-                    return;
+            EventBridge.emitWebEvent(JSON.stringify({
-                }
+                type: WARN_USER_NO_PERMISSIONS
+            }));
+            return;
+        }
 
-                // User must be able to write to Asset Server.
+        // User must be logged in.
-                if (!canWriteAssets) {
+        var loginButton = $("#topnav a[href='/signup']");
-                    console.log("ERROR: Clara.io FBX: File download cancelled because no permissions to write to Asset Server");
+        if (loginButton.length > 0) {
-                    EventBridge.emitWebEvent(WARN_USER_NO_PERMISSIONS);
+            loginButton[0].click();
-                    return;
+            return;
-                }
+        }
 
-                // User must be logged in.
+        // Obtain zip file to download for requested asset.
-                var loginButton = $("#topnav a[href='/signup']");
+        // Reference: https://clara.io/learn/sdk/api/export
-                if (loginButton.length > 0) {
-                    loginButton[0].click();
-                    return;
-                }
 
-                // Obtain zip file to download for requested asset.
+        //var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?zip=true&centerScene=true&alignSceneGround=true&fbxUnit=Meter&fbxVersion=7&fbxEmbedTextures=true&imageFormat=WebGL";
-                // Reference: https://clara.io/learn/sdk/api/export
+        // 13 Jan 2017: Specify FBX version 5 and remove some options in order to make Clara.io site more likely to
+        // be successful in generating zip files.
+        var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?fbxUnit=Meter&fbxVersion=5&fbxEmbedTextures=true&imageFormat=WebGL";
 
-                //var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?zip=true&centerScene=true&alignSceneGround=true&fbxUnit=Meter&fbxVersion=7&fbxEmbedTextures=true&imageFormat=WebGL";
+        var uuid = location.href.match(/\/view\/([a-z0-9\-]*)/)[1];
-                // 13 Jan 2017: Specify FBX version 5 and remove some options in order to make Clara.io site more likely to
+        var url = XMLHTTPREQUEST_URL.replace("{uuid}", uuid);
-                // be successful in generating zip files.
-                var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?fbxUnit=Meter&fbxVersion=5&fbxEmbedTextures=true&imageFormat=WebGL";
 
-                var uuid = location.href.match(/\/view\/([a-z0-9\-]*)/)[1];
+        xmlHttpRequest = new XMLHttpRequest();
-                var url = XMLHTTPREQUEST_URL.replace("{uuid}", uuid);
+        var responseTextIndex = 0;
+        var zipFileURL = "";
 
-                xmlHttpRequest = new XMLHttpRequest();
+        xmlHttpRequest.onreadystatechange = function () {
-                var responseTextIndex = 0;
+            // Messages are appended to responseText; process the new ones.
-                var zipFileURL = "";
+            var message = this.responseText.slice(responseTextIndex);
+            var statusMessage = "";
 
-                xmlHttpRequest.onreadystatechange = function () {
+            if (isPreparing) {  // Ignore messages in flight after finished/cancelled.
-                    // Messages are appended to responseText; process the new ones.
+                var lines = message.split(/[\n\r]+/);
-                    var message = this.responseText.slice(responseTextIndex);
-                    var statusMessage = "";
 
-                    if (isPreparing) {  // Ignore messages in flight after finished/cancelled.
+                for (var i = 0, length = lines.length; i < length; i++) {
-                        var lines = message.split(/[\n\r]+/);
+                    if (lines[i].slice(0, 5) === "data:") {
+                        // Parse line.
+                        var data;
+                        try {
+                            data = JSON.parse(lines[i].slice(5));
+                        }
+                        catch (e) {
+                            data = {};
+                        }
 
-                        for (var i = 0, length = lines.length; i < length; i++) {
+                        // Extract status message.
-                            if (lines[i].slice(0, 5) === "data:") {
+                        if (data.hasOwnProperty("message") && data.message !== null) {
-                                // Parse line.
+                            statusMessage = data.message;
-                                var data;
+                            console.log("Clara.io FBX: " + statusMessage);
-                                try {
+                        }
-                                    data = JSON.parse(lines[i].slice(5));
-                                }
-                                catch (e) {
-                                    data = {};
-                                }
 
-                                // Extract status message.
+                        // Extract zip file URL.
-                                if (data.hasOwnProperty("message") && data.message !== null) {
+                        if (data.hasOwnProperty("files") && data.files.length > 0) {
-                                    statusMessage = data.message;
+                            zipFileURL = data.files[0].url;
-                                    console.log("Clara.io FBX: " + statusMessage);
+                            if (zipFileURL.slice(-4) !== ".zip") {
-                                }
+                                console.log(JSON.stringify(data));  // Data for debugging.
-
-                                // Extract zip file URL.
-                                if (data.hasOwnProperty("files") && data.files.length > 0) {
-                                    zipFileURL = data.files[0].url;
-                                    if (zipFileURL.slice(-4) !== ".zip") {
-                                        console.log(JSON.stringify(data));  // Data for debugging.
-                                    }
-                                }
                             }
                         }
-
-                        if (statusMessage !== "") {
-                            // Update the UI with the most recent status message.
-                            EventBridge.emitWebEvent(CLARA_IO_STATUS + " " + statusMessage);
-                        }
                     }
-
-                    responseTextIndex = this.responseText.length;
-                };
-
-                // Note: onprogress doesn't have computable total length so can't use it to determine % complete.
-
-                xmlHttpRequest.onload = function () {
-                    var statusMessage = "";
-
-                    if (!isPreparing) {
-                        return;
-                    }
-
-                    isPreparing = false;
-
-                    var HTTP_OK = 200;
-                    if (this.status !== HTTP_OK) {
-                        statusMessage = "Zip file request terminated with " + this.status + " " + this.statusText;
-                        console.log("ERROR: Clara.io FBX: " + statusMessage);
-                        EventBridge.emitWebEvent(CLARA_IO_STATUS + " " + statusMessage);
-                    } else if (zipFileURL.slice(-4) !== ".zip") {
-                        statusMessage = "Error creating zip file for download.";
-                        console.log("ERROR: Clara.io FBX: " + statusMessage + ": " + zipFileURL);
-                        EventBridge.emitWebEvent(CLARA_IO_STATUS + " " + statusMessage);
-                    } else {
-                        EventBridge.emitWebEvent(CLARA_IO_DOWNLOAD + " " + zipFileURL);
-                        console.log("Clara.io FBX: File download initiated for " + zipFileURL);
-                    }
-
-                    xmlHttpRequest = null;
                 }
 
-                isPreparing = true;
+                if (statusMessage !== "") {
-
+                    // Update the UI with the most recent status message.
-                console.log("Clara.io FBX: Request zip file for " + uuid);
+                    EventBridge.emitWebEvent(JSON.stringify({
-                EventBridge.emitWebEvent(CLARA_IO_STATUS + " Initiating download");
+                        type: CLARA_IO_STATUS,
-
+                        status: statusMessage
-                xmlHttpRequest.open("POST", url, true);
+                    }));
-                xmlHttpRequest.setRequestHeader("Accept", "text/event-stream");
+                }
-                xmlHttpRequest.send();
             }
+
+            responseTextIndex = this.responseText.length;
+        };
+
+        // Note: onprogress doesn't have computable total length so can't use it to determine % complete.
+
+        xmlHttpRequest.onload = function () {
+            var statusMessage = "";
+
+            if (!isPreparing) {
+                return;
+            }
+
+            isPreparing = false;
+
+            var HTTP_OK = 200;
+            if (this.status !== HTTP_OK) {
+                statusMessage = "Zip file request terminated with " + this.status + " " + this.statusText;
+                console.log("ERROR: Clara.io FBX: " + statusMessage);
+                EventBridge.emitWebEvent(JSON.stringify({
+                    type: CLARA_IO_STATUS,
+                    status: statusMessage
+                }));
+            } else if (zipFileURL.slice(-4) !== ".zip") {
+                statusMessage = "Error creating zip file for download.";
+                console.log("ERROR: Clara.io FBX: " + statusMessage + ": " + zipFileURL);
+                EventBridge.emitWebEvent(JSON.stringify({
+                    type: CLARA_IO_STATUS,
+                    status: (statusMessage + ": " + zipFileURL)
+                }));
+            } else {
+                EventBridge.emitWebEvent(JSON.stringify({
+                    type: CLARA_IO_DOWNLOAD
+                }));
+                console.log("Clara.io FBX: File download initiated for " + zipFileURL);
+            }
+
+            xmlHttpRequest = null;
         }
+
+        isPreparing = true;
+
+        console.log("Clara.io FBX: Request zip file for " + uuid);
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: CLARA_IO_STATUS,
+            status: "Initiating download"
+        }));
+
+        xmlHttpRequest.open("POST", url, true);
+        xmlHttpRequest.setRequestHeader("Accept", "text/event-stream");
+        xmlHttpRequest.send();
     }
 
     function injectClaraCode() {
@@ -663,7 +679,9 @@
             updateClaraCodeInterval = undefined;
         });
 
-        EventBridge.emitWebEvent(QUERY_CAN_WRITE_ASSETS);
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: QUERY_CAN_WRITE_ASSETS
+        }));
     }
 
     function cancelClaraDownload() {
@@ -673,7 +691,9 @@
             xmlHttpRequest.abort();
             xmlHttpRequest = null;
             console.log("Clara.io FBX: File download cancelled");
-            EventBridge.emitWebEvent(CLARA_IO_CANCELLED_DOWNLOAD);
+            EventBridge.emitWebEvent(JSON.stringify({
+                type: CLARA_IO_CANCELLED_DOWNLOAD
+            }));
         }
     }
 
@@ -708,25 +728,22 @@
 
     function onLoad() {
         EventBridge.scriptEventReceived.connect(function (message) {
-            if (message.slice(0, CAN_WRITE_ASSETS.length) === CAN_WRITE_ASSETS) {
+            message = JSON.parse(message);
-                canWriteAssets = message.slice(-4) === "true";
+            if (message.type === CAN_WRITE_ASSETS) {
-            } else if (message.slice(0, CLARA_IO_CANCEL_DOWNLOAD.length) === CLARA_IO_CANCEL_DOWNLOAD) {
+                canWriteAssets = message.canWriteAssets;
+            } else if (message.type === CLARA_IO_CANCEL_DOWNLOAD) {
                 cancelClaraDownload();
-            } else {
+            } else if (message.type === "marketplaces") {
-                var parsedJsonMessage = JSON.parse(message);
+                if (message.action === "commerceSetting") {
-
+                    commerceMode = !!message.data.commerceMode;
-                if (parsedJsonMessage.type === "marketplaces") {
+                    userIsLoggedIn = !!message.data.userIsLoggedIn;
-                    if (parsedJsonMessage.action === "commerceSetting") {
+                    walletNeedsSetup = !!message.data.walletNeedsSetup;
-                        commerceMode = !!parsedJsonMessage.data.commerceMode;
+                    marketplaceBaseURL = message.data.metaverseServerURL;
-                        userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn;
+                    if (marketplaceBaseURL.indexOf('metaverse.') !== -1) {
-                        walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup;
+                        marketplaceBaseURL = marketplaceBaseURL.replace('metaverse.', '');
-                        marketplaceBaseURL = parsedJsonMessage.data.metaverseServerURL;
-                        if (marketplaceBaseURL.indexOf('metaverse.') !== -1) {
-                            marketplaceBaseURL = marketplaceBaseURL.replace('metaverse.', '');
-                        }
-                        messagesWaiting = parsedJsonMessage.data.messagesWaiting;
-                        injectCode();
                     }
+                    messagesWaiting = message.data.messagesWaiting;
+                    injectCode();
                 }
             }
         });
@@ -739,6 +756,6 @@
     }
 
     // Load / unload.
-    window.addEventListener("load", onLoad);  // More robust to Web site issues than using $(document).ready().
+    window.addEventListener("load", onLoad); // More robust to Web site issues than using $(document).ready().
-    window.addEventListener("page:change", onLoad);  // Triggered after Marketplace HTML is changed
+    window.addEventListener("page:change", onLoad); // Triggered after Marketplace HTML is changed
 }());

scripts/system/interstitialPage.js

@@ -140,7 +140,6 @@
         localPosition: { x: 0.0 , y: -1.5, z: -0.3 },
         url: Script.resourcesPath() + "images/interstitialPage/goTo_button.png",
         alpha: 1,
-        dimensions: { x: 1.5, y: 1.0 },
         visible: isVisible,
         emissive: true,
         ignoreRayIntersection: false,

scripts/system/libraries/gridTool.js

@@ -267,7 +267,6 @@ GridTool = function(opts) {
         try {
             data = JSON.parse(data);
         } catch (e) {
-            print("gridTool.js: Error parsing JSON: " + e.name + " data " + data);
             return;
         }
 

scripts/system/pal.js

@@ -1,6 +1,9 @@
 "use strict";
-/*jslint vars:true, plusplus:true, forin:true*/
+/* jslint vars:true, plusplus:true, forin:true */
-/*global Tablet, Settings, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, HMD, Controller, Account, UserActivityLogger, Messages, Window, XMLHttpRequest, print, location, getControllerWorldLocation*/
+/* global Tablet, Settings, Script, AvatarList, Users, Entities,
+    MyAvatar, Camera, Overlays, Vec3, Quat, HMD, Controller, Account,
+    UserActivityLogger, Messages, Window, XMLHttpRequest, print, location, getControllerWorldLocation
+*/
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // pal.js
@@ -20,7 +23,7 @@ var AppUi = Script.require('appUi');
 var populateNearbyUserList, color, textures, removeOverlays,
     controllerComputePickRay, off,
     receiveMessage, avatarDisconnected, clearLocalQMLDataAndClosePAL,
-    CHANNEL, getConnectionData, findableByChanged,
+    CHANNEL, getConnectionData,
     avatarAdded, avatarRemoved, avatarSessionChanged; // forward references;
 
 // hardcoding these as it appears we cannot traverse the originalTextures in overlays???  Maybe I've missed
@@ -318,6 +321,10 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
         break;
     case 'http.request':
         break; // Handled by request-service.
+    case 'hideNotificationDot':
+        shouldShowDot = false;
+        ui.messagesWaiting(shouldShowDot);
+        break;
     default:
         print('Unrecognized message from Pal.qml:', JSON.stringify(message));
     }
@@ -361,8 +368,8 @@ function getProfilePicture(username, callback) { // callback(url) if successfull
     });
 }
 var SAFETY_LIMIT = 400;
-function getAvailableConnections(domain, callback) { // callback([{usename, location}...]) if successfull. (Logs otherwise)
+function getAvailableConnections(domain, callback, numResultsPerPage) { // callback([{usename, location}...]) if successfull. (Logs otherwise)
-    var url = METAVERSE_BASE + '/api/v1/users?per_page=' + SAFETY_LIMIT + '&';
+    var url = METAVERSE_BASE + '/api/v1/users?per_page=' + (numResultsPerPage || SAFETY_LIMIT) + '&';
     if (domain) {
         url += 'status=' + domain.slice(1, -1); // without curly braces
     } else {
@@ -713,7 +720,7 @@ function tabletVisibilityChanged() {
     if (!ui.tablet.tabletShown && ui.isOpen) {
         ui.close();
     }
-    }
+}
 
 var UPDATE_INTERVAL_MS = 100;
 var updateInterval;
@@ -725,10 +732,14 @@ function createUpdateInterval() {
 
 var previousContextOverlay = ContextOverlay.enabled;
 var previousRequestsDomainListData = Users.requestsDomainListData;
-function on() {
+function palOpened() {
+    ui.sendMessage({
+        method: 'changeConnectionsDotStatus',
+        shouldShowDot: shouldShowDot
+    });
 
     previousContextOverlay = ContextOverlay.enabled;
-    previousRequestsDomainListData = Users.requestsDomainListData
+    previousRequestsDomainListData = Users.requestsDomainListData;
     ContextOverlay.enabled = false;
     Users.requestsDomainListData = true;
 
@@ -807,14 +818,98 @@ function avatarSessionChanged(avatarID) {
     sendToQml({ method: 'palIsStale', params: [avatarID, 'avatarSessionChanged'] });
 }
 
+function notificationDataProcessPage(data) {
+    return data.data.users;
+}
+
+var shouldShowDot = false;
+var storedOnlineUsersArray = [];
+function notificationPollCallback(connectionsArray) {
+    //
+    // START logic for handling online/offline user changes
+    //
+    var i, j;
+    var newlyOnlineConnectionsArray = [];
+    for (i = 0; i < connectionsArray.length; i++) {
+        var currentUser = connectionsArray[i];
+
+        if (connectionsArray[i].online) {
+            var indexOfStoredOnlineUser = -1;
+            for (j = 0; j < storedOnlineUsersArray.length; j++) {
+                if (currentUser.username === storedOnlineUsersArray[j].username) {
+                    indexOfStoredOnlineUser = j;
+                    break;
+                }
+            }
+            // If the user record isn't already presesnt inside `storedOnlineUsersArray`...
+            if (indexOfStoredOnlineUser < 0) {
+                storedOnlineUsersArray.push(currentUser);
+                newlyOnlineConnectionsArray.push(currentUser);
+            }
+        } else {
+            var indexOfOfflineUser = -1;
+            for (j = 0; j < storedOnlineUsersArray.length; j++) {
+                if (currentUser.username === storedOnlineUsersArray[j].username) {
+                    indexOfOfflineUser = j;
+                    break;
+                }
+            }
+            if (indexOfOfflineUser >= 0) {
+                storedOnlineUsersArray.splice(indexOfOfflineUser);
+            }
+        }
+    }
+    // If there's new data, the light should turn on.
+    // If the light is already on and you have connections online, the light should stay on.
+    // In all other cases, the light should turn off or stay off.
+    shouldShowDot = newlyOnlineConnectionsArray.length > 0 || (storedOnlineUsersArray.length > 0 && shouldShowDot);
+    //
+    // END logic for handling online/offline user changes
+    //
+
+    if (!ui.isOpen) {
+        ui.messagesWaiting(shouldShowDot);
+        ui.sendMessage({
+            method: 'changeConnectionsDotStatus',
+            shouldShowDot: shouldShowDot
+        });
+
+        if (newlyOnlineConnectionsArray.length > 0) {
+            var message;
+            if (!ui.notificationInitialCallbackMade) {
+                message = newlyOnlineConnectionsArray.length + " of your connections " +
+                    (newlyOnlineConnectionsArray.length === 1 ? "is" : "are") + " online. Open PEOPLE to join them!";
+                ui.notificationDisplayBanner(message);
+            } else {
+                for (i = 0; i < newlyOnlineConnectionsArray.length; i++) {
+                    message = newlyOnlineConnectionsArray[i].username + " is available in " +
+                        newlyOnlineConnectionsArray[i].location.root.name + ". Open PEOPLE to join them!";
+                    ui.notificationDisplayBanner(message);
+                }
+            }
+        }
+    }
+}
+
+function isReturnedDataEmpty(data) {
+    var usersArray = data.data.users;
+    return usersArray.length === 0;
+}
+
 function startup() {
     ui = new AppUi({
         buttonName: "PEOPLE",
         sortOrder: 7,
         home: "hifi/Pal.qml",
-        onOpened: on,
+        onOpened: palOpened,
         onClosed: off,
-        onMessage: fromQml
+        onMessage: fromQml,
+        notificationPollEndpoint: "/api/v1/users?filter=connections&per_page=10",
+        notificationPollTimeoutMs: 60000,
+        notificationDataProcessPage: notificationDataProcessPage,
+        notificationPollCallback: notificationPollCallback,
+        notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
+        notificationPollCaresAboutSince: false
     });
     Window.domainChanged.connect(clearLocalQMLDataAndClosePAL);
     Window.domainConnectionRefused.connect(clearLocalQMLDataAndClosePAL);

scripts/system/snapshot.js

@@ -7,28 +7,19 @@
 // Distributed under the Apache License, Version 2.0
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals Tablet, Script, HMD, Settings, DialogsManager, Menu, Reticle, OverlayWebWindow, Desktop, Account, MyAvatar, Snapshot */
+/* globals Tablet, Script, HMD, Settings, DialogsManager, Menu, Reticle,
+    OverlayWebWindow, Desktop, Account, MyAvatar, Snapshot */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
 (function () { // BEGIN LOCAL_SCOPE
 Script.include("/~/system/libraries/accountUtils.js");
+var AppUi = Script.require('appUi');
 
 var SNAPSHOT_DELAY = 500; // 500ms
 var FINISH_SOUND_DELAY = 350;
 var resetOverlays;
 var reticleVisible;
 
-var buttonName = "SNAP";
-var buttonConnected = false;
-
-var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-var button = tablet.addButton({
-    icon: "icons/tablet-icons/snap-i.svg",
-    activeIcon: "icons/tablet-icons/snap-a.svg",
-    text: buttonName,
-    sortOrder: 5
-});
-
 var snapshotOptions = {};
 var imageData = [];
 var storyIDsToMaybeDelete = [];
@@ -52,8 +43,6 @@ try {
     print('Failed to resolve request api, error: ' + err);
 }
 
-
-
 function removeFromStoryIDsToMaybeDelete(story_id) {
     storyIDsToMaybeDelete.splice(storyIDsToMaybeDelete.indexOf(story_id), 1);
     print('storyIDsToMaybeDelete[] now:', JSON.stringify(storyIDsToMaybeDelete));
@@ -73,33 +62,32 @@ function onMessage(message) {
     // 2. Although we currently use a single image, we would like to take snapshot, a selfie, a 360 etc. all at the
     //    same time, show the user all of them, and have the user deselect any that they do not want to share.
     //    So we'll ultimately be receiving a set of objects, perhaps with different post processing for each.
-    message = JSON.parse(message);
     if (message.type !== "snapshot") {
         return;
     }
 
     switch (message.action) {
         case 'ready': // DOM is ready and page has loaded
-            tablet.emitScriptEvent(JSON.stringify({
+            ui.sendMessage({
                 type: "snapshot",
                 action: "captureSettings",
                 setting: Settings.getValue("alsoTakeAnimatedSnapshot", true)
-            }));
+            });
             if (Snapshot.getSnapshotsLocation() !== "") {
                 isDomainOpen(Settings.getValue("previousSnapshotDomainID"), function (canShare) {
-                    tablet.emitScriptEvent(JSON.stringify({
+                    ui.sendMessage({
                         type: "snapshot",
                         action: "showPreviousImages",
                         options: snapshotOptions,
                         image_data: imageData,
                         canShare: canShare
-                    }));
+                    });
                 });                
             } else {
-                tablet.emitScriptEvent(JSON.stringify({
+                ui.sendMessage({
                     type: "snapshot",
                     action: "showSetupInstructions"
-                }));
+                });
                 Settings.setValue("previousStillSnapPath", "");
                 Settings.setValue("previousStillSnapStoryID", "");
                 Settings.setValue("previousStillSnapBlastingDisabled", false);
@@ -124,7 +112,7 @@ function onMessage(message) {
                 || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
                 Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
             } else {
-                tablet.loadQMLOnTop("hifi/tablet/TabletGeneralPreferences.qml");
+                ui.openNewAppOnTop("hifi/tablet/TabletGeneralPreferences.qml");
             }
             break;
         case 'captureStillAndGif':
@@ -284,7 +272,6 @@ var POLAROID_RATE_LIMIT_MS = 1000;
 var polaroidPrintingIsRateLimited = false;
 
 function printToPolaroid(image_url) {
-
     // Rate-limit printing
     if (polaroidPrintingIsRateLimited) {
         return;
@@ -376,19 +363,6 @@ function fillImageDataFromPrevious() {
     }
 }
 
-var SNAPSHOT_REVIEW_URL = Script.resolvePath("html/SnapshotReview.html");
-var isInSnapshotReview = false;
-function onButtonClicked() {
-    if (isInSnapshotReview){
-        // for toolbar-mode: go back to home screen, this will close the window.
-        tablet.gotoHomeScreen();
-    } else {
-        fillImageDataFromPrevious();
-        tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
-        HMD.openTablet();
-    }
-}
-
 function snapshotUploaded(isError, reply) {
     if (!isError) {
         var replyJson = JSON.parse(reply),
@@ -409,12 +383,12 @@ function snapshotUploaded(isError, reply) {
         }
         if ((isGif && !ignoreGifSnapshotData) || (!isGif && !ignoreStillSnapshotData)) {
             print('SUCCESS: Snapshot uploaded! Story with audience:for_url created! ID:', storyID);
-            tablet.emitScriptEvent(JSON.stringify({
+            ui.sendMessage({
                 type: "snapshot",
                 action: "snapshotUploadComplete",
                 story_id: storyID,
                 image_url: imageURL,
-            }));
+            });
             if (isGif) {
                 Settings.setValue("previousAnimatedSnapStoryID", storyID);
             } else {
@@ -429,10 +403,10 @@ function snapshotUploaded(isError, reply) {
 }
 var href, snapshotDomainID;
 function takeSnapshot() {
-    tablet.emitScriptEvent(JSON.stringify({
+    ui.sendMessage({
         type: "snapshot",
         action: "clearPreviousImages"
-    }));
+    });
     Settings.setValue("previousStillSnapPath", "");
     Settings.setValue("previousStillSnapStoryID", "");
     Settings.setValue("previousStillSnapBlastingDisabled", false);
@@ -471,10 +445,6 @@ function takeSnapshot() {
     } else {
         Window.stillSnapshotTaken.connect(stillSnapshotTaken);
     }
-    if (buttonConnected) {
-        button.clicked.disconnect(onButtonClicked);
-        buttonConnected = false;
-    }
 
     // hide overlays if they are on
     if (resetOverlays) {
@@ -538,10 +508,6 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
         Menu.setIsOptionChecked("Show Overlays", true);
     }
     Window.stillSnapshotTaken.disconnect(stillSnapshotTaken);
-    if (!buttonConnected) {
-        button.clicked.connect(onButtonClicked);
-        buttonConnected = true;
-    }
 
     // A Snapshot Review dialog might be left open indefinitely after taking the picture,
     // during which time the user may have moved. So stash that info in the dialog so that
@@ -559,12 +525,12 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
             isLoggedIn: isLoggedIn
         };
         imageData = [{ localPath: pathStillSnapshot, href: href }];
-        tablet.emitScriptEvent(JSON.stringify({
+        ui.sendMessage({
             type: "snapshot",
             action: "addImages",
             options: snapshotOptions,
             image_data: imageData
-        }));
+        });
     });
 }
 
@@ -572,10 +538,10 @@ function snapshotDirChanged(snapshotPath) {
     Window.browseDirChanged.disconnect(snapshotDirChanged);
     if (snapshotPath !== "") { // not cancelled
         Snapshot.setSnapshotsLocation(snapshotPath);
-        tablet.emitScriptEvent(JSON.stringify({
+        ui.sendMessage({
             type: "snapshot",
             action: "snapshotLocationChosen"
-        }));
+        });
     }
 }
 
@@ -603,22 +569,18 @@ function processingGifStarted(pathStillSnapshot) {
             isLoggedIn: isLoggedIn
         };
         imageData = [{ localPath: pathStillSnapshot, href: href }];
-        tablet.emitScriptEvent(JSON.stringify({
+        ui.sendMessage({
             type: "snapshot",
             action: "addImages",
             options: snapshotOptions,
             image_data: imageData
-        }));
+        });
     });
 }
 
 function processingGifCompleted(pathAnimatedSnapshot) {
     isLoggedIn = Account.isLoggedIn();
     Window.processingGifCompleted.disconnect(processingGifCompleted);
-    if (!buttonConnected) {
-        button.clicked.connect(onButtonClicked);
-        buttonConnected = true;
-    }
 
     Settings.setValue("previousAnimatedSnapPath", pathAnimatedSnapshot);
 
@@ -631,12 +593,12 @@ function processingGifCompleted(pathAnimatedSnapshot) {
             canBlast: location.domainID === Settings.getValue("previousSnapshotDomainID"),
         };
         imageData = [{ localPath: pathAnimatedSnapshot, href: href }];
-        tablet.emitScriptEvent(JSON.stringify({
+        ui.sendMessage({
             type: "snapshot",
             action: "addImages",
             options: snapshotOptions,
             image_data: imageData
-        }));
+        });
     });
 }
 function maybeDeleteSnapshotStories() {
@@ -655,28 +617,16 @@ function maybeDeleteSnapshotStories() {
     });
     storyIDsToMaybeDelete = [];
 }
-function onTabletScreenChanged(type, url) {
-    var wasInSnapshotReview = isInSnapshotReview; 
-    isInSnapshotReview = (type === "Web" && url === SNAPSHOT_REVIEW_URL);
-    button.editProperties({ isActive: isInSnapshotReview });
-    if (isInSnapshotReview !== wasInSnapshotReview) {
-        if (isInSnapshotReview) {
-            tablet.webEventReceived.connect(onMessage);
-        } else {
-            tablet.webEventReceived.disconnect(onMessage);
-        }
-    }
-}
 function onUsernameChanged() {
     fillImageDataFromPrevious();
     isDomainOpen(Settings.getValue("previousSnapshotDomainID"), function (canShare) {
-        tablet.emitScriptEvent(JSON.stringify({
+        ui.sendMessage({
             type: "snapshot",
             action: "showPreviousImages",
             options: snapshotOptions,
             image_data: imageData,
             canShare: canShare
-        }));
+        });
     });
     if (isLoggedIn) {
         if (shareAfterLogin) {
@@ -705,10 +655,10 @@ function onUsernameChanged() {
 
 function snapshotLocationSet(location) {
     if (location !== "") {
-        tablet.emitScriptEvent(JSON.stringify({
+        ui.sendMessage({
             type: "snapshot",
             action: "snapshotLocationChosen"
-        }));
+        });
     }
 }
 
@@ -733,36 +683,36 @@ function processRezPermissionChange(canRez) {
         action = 'setPrintButtonDisabled';
     }
     
-    tablet.emitScriptEvent(JSON.stringify({
+    ui.sendMessage({
         type: "snapshot",
         action : action
-    }));
+    });
 }
 
-button.clicked.connect(onButtonClicked);
+function startup() {
-buttonConnected = true;
+    ui = new AppUi({
+        buttonName: "SNAP",
+        sortOrder: 5,
+        home: Script.resolvePath("html/SnapshotReview.html"),
+        onOpened: fillImageDataFromPrevious,
+        onMessage: onMessage
+    });
 
-Window.snapshotShared.connect(snapshotUploaded);
+    Entities.canRezChanged.connect(updatePrintPermissions);
-tablet.screenChanged.connect(onTabletScreenChanged);
+    Entities.canRezTmpChanged.connect(updatePrintPermissions);
-GlobalServices.myUsernameChanged.connect(onUsernameChanged);
+    GlobalServices.myUsernameChanged.connect(onUsernameChanged);
-Snapshot.snapshotLocationSet.connect(snapshotLocationSet);
+    Snapshot.snapshotLocationSet.connect(snapshotLocationSet);
+    Window.snapshotShared.connect(snapshotUploaded);
+}
+startup();
 
-Entities.canRezChanged.connect(updatePrintPermissions);
+function shutdown() {
-Entities.canRezTmpChanged.connect(updatePrintPermissions);
-
-Script.scriptEnding.connect(function () {
-    if (buttonConnected) {
-        button.clicked.disconnect(onButtonClicked);
-        buttonConnected = false;
-    }
-    if (tablet) {
-        tablet.removeButton(button);
-        tablet.screenChanged.disconnect(onTabletScreenChanged);
-    }
     Window.snapshotShared.disconnect(snapshotUploaded);
     Snapshot.snapshotLocationSet.disconnect(snapshotLocationSet);
+    GlobalServices.myUsernameChanged.disconnect(onUsernameChanged);
     Entities.canRezChanged.disconnect(updatePrintPermissions);
     Entities.canRezTmpChanged.disconnect(updatePrintPermissions);
-});
+}
+Script.scriptEnding.connect(shutdown);
 
 }()); // END LOCAL_SCOPE

scripts/system/tablet-goto.js

@@ -1,9 +1,10 @@
 "use strict";
-/*jslint vars:true, plusplus:true, forin:true*/
+/* jslint vars:true, plusplus:true, forin:true */
-/*global Window, Script, Tablet, HMD, Controller, Account, XMLHttpRequest, location, print*/
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+/* global Window, Script, Tablet, HMD, Controller, Account, XMLHttpRequest, location, print */
 
 //
-//  goto.js
+//  tablet-goto.js
 //  scripts/system/
 //
 //  Created by Dante Ruiz on 8 February 2017
@@ -14,148 +15,118 @@
 //
 
 (function () { // BEGIN LOCAL_SCOPE
+var request = Script.require('request').request;
+var AppUi = Script.require('appUi');
+var DEBUG = false;
+function debug() {
+    if (!DEBUG) {
+        return;
+    }
+    print('tablet-goto.js:', [].map.call(arguments, JSON.stringify));
+}
 
-    var request = Script.require('request').request;
+var stories = {}, pingPong = false;
-    var DEBUG = false;
+function expire(id) {
-    function debug() {
+    var options = {
-        if (!DEBUG) {
+        uri: Account.metaverseServerURL + '/api/v1/user_stories/' + id,
+        method: 'PUT',
+        json: true,
+        body: {expire: "true"}
+    };
+    request(options, function (error, response) {
+        debug('expired story', options, 'error:', error, 'response:', response);
+        if (error || (response.status !== 'success')) {
+            print("ERROR expiring story: ", error || response.status);
+        }
+    });
+}
+var PER_PAGE_DEBUG = 10;
+var PER_PAGE_NORMAL = 100;
+function pollForAnnouncements() {
+    // We could bail now if !Account.isLoggedIn(), but what if we someday have system-wide announcments?
+    var actions = 'announcement';
+    var count = DEBUG ? PER_PAGE_DEBUG : PER_PAGE_NORMAL;
+    var options = [
+        'now=' + new Date().toISOString(),
+        'include_actions=' + actions,
+        'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
+        'require_online=true',
+        'protocol=' + encodeURIComponent(Window.protocolSignature()),
+        'per_page=' + count
+    ];
+    var url = Account.metaverseServerURL + '/api/v1/user_stories?' + options.join('&');
+    request({
+        uri: url
+    }, function (error, data) {
+        debug(url, error, data);
+        if (error || (data.status !== 'success')) {
+            print("Error: unable to get", url, error || data.status);
             return;
         }
-        print('tablet-goto.js:', [].map.call(arguments, JSON.stringify));
+        var didNotify = false, key;
-    }
+        pingPong = !pingPong;
-
+        data.user_stories.forEach(function (story) {
-    var gotoQmlSource = "hifi/tablet/TabletAddressDialog.qml";
+            var stored = stories[story.id], storedOrNew = stored || story;
-    var buttonName = "GOTO";
+            debug('story exists:', !!stored, storedOrNew);
-    var onGotoScreen = false;
+            if ((storedOrNew.username === Account.username) && (storedOrNew.place_name !== location.placename)) {
-    var shouldActivateButton = false;
+                if (storedOrNew.audience === 'for_connections') { // Only expire if we haven't already done so.
-    function ignore() { }
+                    expire(story.id);
-
+                }
-    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+                return; // before marking
-    var NORMAL_ICON    = "icons/tablet-icons/goto-i.svg";
-    var NORMAL_ACTIVE  = "icons/tablet-icons/goto-a.svg";
-    var WAITING_ICON   = "icons/tablet-icons/goto-msg.svg";
-    var button = tablet.addButton({
-        icon: NORMAL_ICON,
-        activeIcon: NORMAL_ACTIVE,
-        text: buttonName,
-        sortOrder: 8
-    });
-    
-    function messagesWaiting(isWaiting) {
-        button.editProperties({
-            icon: isWaiting ? WAITING_ICON : NORMAL_ICON
-            // No need for a different activeIcon, because we issue messagesWaiting(false) when the button goes active anyway.
-        });
-    }
-
-    function onClicked() {
-        if (onGotoScreen) {
-            // for toolbar-mode: go back to home screen, this will close the window.
-            tablet.gotoHomeScreen();
-        } else {
-            shouldActivateButton = true;
-            tablet.loadQMLSource(gotoQmlSource);
-            onGotoScreen = true;
-        }
-    }
-
-    function onScreenChanged(type, url) {
-        ignore(type);
-        if (url === gotoQmlSource) {
-            onGotoScreen = true;
-            shouldActivateButton = true;
-            button.editProperties({isActive: shouldActivateButton});
-            messagesWaiting(false);
-        } else {
-            shouldActivateButton = false;
-            onGotoScreen = false;
-            button.editProperties({isActive: shouldActivateButton});
-        }
-    }
-    button.clicked.connect(onClicked);
-    tablet.screenChanged.connect(onScreenChanged);
-
-    var stories = {}, pingPong = false;
-    function expire(id) {
-        var options = {
-            uri: Account.metaverseServerURL + '/api/v1/user_stories/' + id,
-            method: 'PUT',
-            json: true,
-            body: {expire: "true"}
-        };
-        request(options, function (error, response) {
-            debug('expired story', options, 'error:', error, 'response:', response);
-            if (error || (response.status !== 'success')) {
-                print("ERROR expiring story: ", error || response.status);
             }
-        });
+            storedOrNew.pingPong = pingPong;
-    }
+            if (stored) { // already seen
-    function pollForAnnouncements() {
-        // We could bail now if !Account.isLoggedIn(), but what if we someday have system-wide announcments?
-        var actions = 'announcement';
-        var count = DEBUG ? 10 : 100;
-        var options = [
-            'now=' + new Date().toISOString(),
-            'include_actions=' + actions,
-            'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
-            'require_online=true',
-            'protocol=' + encodeURIComponent(Window.protocolSignature()),
-            'per_page=' + count
-        ];
-        var url = Account.metaverseServerURL + '/api/v1/user_stories?' + options.join('&');
-        request({
-            uri: url
-        }, function (error, data) {
-            debug(url, error, data);
-            if (error || (data.status !== 'success')) {
-                print("Error: unable to get", url,  error || data.status);
                 return;
             }
-            var didNotify = false, key;
+            stories[story.id] = story;
-            pingPong = !pingPong;
+            var message = story.username + " " + story.action_string + " in " +
-            data.user_stories.forEach(function (story) {
+                story.place_name + ". Open GOTO to join them.";
-                var stored = stories[story.id], storedOrNew = stored || story;
+            Window.displayAnnouncement(message);
-                debug('story exists:', !!stored, storedOrNew);
+            didNotify = true;
-                if ((storedOrNew.username === Account.username) && (storedOrNew.place_name !== location.placename)) {
-                    if (storedOrNew.audience == 'for_connections') { // Only expire if we haven't already done so.
-                        expire(story.id);
-                    }
-                    return; // before marking
-                }
-                storedOrNew.pingPong = pingPong;
-                if (stored) { // already seen
-                    return;
-                }
-                stories[story.id] = story;
-                var message = story.username + " " + story.action_string + " in " + story.place_name + ". Open GOTO to join them.";
-                Window.displayAnnouncement(message);
-                didNotify = true;
-            });
-            for (key in stories) { // Any story we were tracking that was not marked, has expired.
-                if (stories[key].pingPong !== pingPong) {
-                    debug('removing story', key);
-                    delete stories[key];
-                }
-            }
-            if (didNotify) {
-                messagesWaiting(true);
-                if (HMD.isHandControllerAvailable()) {
-                    var STRENGTH = 1.0, DURATION_MS = 60, HAND = 2; // both hands
-                    Controller.triggerHapticPulse(STRENGTH, DURATION_MS, HAND);
-                }
-            } else if (!Object.keys(stories).length) { // If there's nothing being tracked, then any messageWaiting has expired.
-                messagesWaiting(false);
-            }
         });
-    }
+        for (key in stories) { // Any story we were tracking that was not marked, has expired.
-    var ANNOUNCEMENTS_POLL_TIME_MS = (DEBUG ? 10 : 60) * 1000;
+            if (stories[key].pingPong !== pingPong) {
-    var pollTimer = Script.setInterval(pollForAnnouncements, ANNOUNCEMENTS_POLL_TIME_MS);
+                debug('removing story', key);
-
+                delete stories[key];
-    Script.scriptEnding.connect(function () {
+            }
-        Script.clearInterval(pollTimer);
+        }
-        button.clicked.disconnect(onClicked);
+        if (didNotify) {
-        tablet.removeButton(button);
+            ui.messagesWaiting(true);
-        tablet.screenChanged.disconnect(onScreenChanged);
+            if (HMD.isHandControllerAvailable()) {
+                var STRENGTH = 1.0, DURATION_MS = 60, HAND = 2; // both hands
+                Controller.triggerHapticPulse(STRENGTH, DURATION_MS, HAND);
+            }
+        } else if (!Object.keys(stories).length) { // If there's nothing being tracked, then any messageWaiting has expired.
+            ui.messagesWaiting(false);
+        }
     });
+}
+var MS_PER_SEC = 1000;
+var DEBUG_POLL_TIME_SEC = 10;
+var NORMAL_POLL_TIME_SEC = 60;
+var ANNOUNCEMENTS_POLL_TIME_MS = (DEBUG ? DEBUG_POLL_TIME_SEC : NORMAL_POLL_TIME_SEC) * MS_PER_SEC;
+var pollTimer = Script.setInterval(pollForAnnouncements, ANNOUNCEMENTS_POLL_TIME_MS);
 
+function gotoOpened() {
+    ui.messagesWaiting(false);
+}
+
+var ui;
+var GOTO_QML_SOURCE = "hifi/tablet/TabletAddressDialog.qml";
+var BUTTON_NAME = "GOTO";
+function startup() {
+    ui = new AppUi({
+        buttonName: BUTTON_NAME,
+        sortOrder: 8,
+        onOpened: gotoOpened,
+        home: GOTO_QML_SOURCE
+    });
+}
+
+function shutdown() {
+    Script.clearInterval(pollTimer);
+}
+
+startup();
+Script.scriptEnding.connect(shutdown);
 }()); // END LOCAL_SCOPE