From 67b1015f4a2b173e06dc1d3ddceab8b0db979acf Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 5 May 2016 14:54:04 -0700
Subject: [PATCH] re add users to default, default to visible friends only
---
interface/src/DiscoverabilityManager.cpp | 2 +-
scripts/defaultScripts.js | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/src/DiscoverabilityManager.cpp b/interface/src/DiscoverabilityManager.cpp
index 230f4202c8..46aabe8702 100644
--- a/interface/src/DiscoverabilityManager.cpp
+++ b/interface/src/DiscoverabilityManager.cpp
@@ -20,7 +20,7 @@
#include "DiscoverabilityManager.h"
#include "Menu.h"
-const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::All;
+const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::Friends;
DiscoverabilityManager::DiscoverabilityManager() :
_mode("discoverabilityMode", DEFAULT_DISCOVERABILITY_MODE)
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index ceccf20647..3904d97a91 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -8,9 +8,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-Script.load("system/away.js");
-Script.load("system/progress.js");
Script.load("system/edit.js");
+Script.load("system/progress.js");
+Script.load("system/away.js");
+Script.load("system/users.js");
Script.load("system/examples.js");
Script.load("system/selectAudioDevice.js");
Script.load("system/notifications.js");