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

.eslintrc.js

@@ -36,6 +36,7 @@ module.exports = {
         "GlobalServices": false,
         "GooglePoly": false,
         "Graphics": false,
+        "HifiAbout": false,
         "HMD": false,
         "LaserPointers": false,
         "location": true,

libraries/gl/src/gl/GLShaders.cpp

@@ -14,7 +14,7 @@ using namespace gl;
 
 void Uniform::load(GLuint glprogram, int index) {
     this->index = index;
-    if (index > 0) {
+    if (index >= 0) {
         static const GLint NAME_LENGTH = 1024;
         GLchar glname[NAME_LENGTH];
         memset(glname, 0, NAME_LENGTH);

server-console/package.json

@@ -8,8 +8,8 @@
     ""
   ],
   "devDependencies": {
-    "electron-packager": "^12.0.0",
-    "electron": "1.8.4"
+    "electron": "^3.0.0",
+    "electron-packager": "^12.1.2"
   },
   "repository": {
     "type": "git",
@@ -23,14 +23,15 @@
     "packager": "node packager.js"
   },
   "dependencies": {
-    "always-tail": "0.2.0",
-    "cheerio": "^0.19.0",
+    "always-tail": "^0.2.0",
+    "cheerio": "^0.22.0",
+    "debug": "^4.0.1",
     "electron-log": "1.1.1",
     "extend": "^3.0.0",
     "fs-extra": "^6.0.0",
     "node-notifier": "^5.2.1",
     "os-homedir": "^1.0.1",
-    "request": "^2.85.0",
+    "request": "^2.88.0",
     "request-progress": "1.0.2",
     "tar-fs": "^1.12.0",
     "yargs": "^3.30.0"

server-console/src/main.js

@@ -247,15 +247,12 @@ process.on('uncaughtException', function(err) {
     log.error(err.stack);
 });
 
-var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
-    // Someone tried to run a second instance, focus the window (if there is one)
-    return true;
-});
+const gotTheLock = app.requestSingleInstanceLock()
 
-if (shouldQuit) {
-    log.warn("Another instance of the Sandbox is already running - this instance will quit.");
-    app.exit(0);
-    return;
+if (!gotTheLock) {
+  log.warn("Another instance of the Sandbox is already running - this instance will quit.");
+  app.exit(0);
+  return;
 }
 
 // Check command line arguments to see how to find binaries