Merge branch 'master' into gha-master-ci

.eslintrc.js

@@ -5,6 +5,7 @@ module.exports = {
         "ecmaVersion": 5
     },
     "globals": {
+        "About": false,
         "Account": false,
         "Agent": false,
         "AnimationCache": false,

android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java

@@ -9,7 +9,7 @@ import java.net.URISyntaxException;
 
 public class HifiUtils {
 
-    public static final String METAVERSE_BASE_URL = "https://metaverse.highfidelity.com";
+    public static final String METAVERSE_BASE_URL = "https://metaverse.vircadia.com/live";
 
     private static HifiUtils instance;
 

android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java

@@ -41,7 +41,7 @@ public class LoginFragment extends Fragment
 
     private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID;
     private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI;
-    private final String OAUTH_AUTHORIZE_BASE_URL = "https://highfidelity.com/oauth/authorize";
+    private final String OAUTH_AUTHORIZE_BASE_URL = "https://metaverse.vircadia.com/live/oauth/authorize";
     private static final int OAUTH_AUTHORIZE_REQUEST = 1;
 
     private EditText mUsername;
@@ -222,7 +222,7 @@ public class LoginFragment extends Fragment
     }
 
     private void onForgotPasswordClicked() {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://highfidelity.com/users/password/new"));
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://metaverse.vircadia.com/live/users/password/new"));
         startActivity(intent);
     }
 

android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java

@@ -28,7 +28,7 @@ import retrofit2.http.Query;
 
 public class EndpointUsersProvider implements UsersProvider {
 
-    public static final String BASE_URL = "https://metaverse.highfidelity.com/";
+    public static final String BASE_URL = "https://metaverse.vircadia.com/live/";
     private final Retrofit mRetrofit;
     private final EndpointUsersProviderService mEndpointUsersProviderService;
 
@@ -154,18 +154,18 @@ public class EndpointUsersProvider implements UsersProvider {
     }
 
     public interface EndpointUsersProviderService {
-        @GET("api/v1/users")
+        @GET("/api/v1/users")
         Call<UsersResponse> getUsers(@Query("filter") String filter,
                                            @Query("per_page") int perPage,
                                            @Query("online") Boolean online);
 
-        @DELETE("api/v1/user/connections/{connectionUserName}")
+        @DELETE("/api/v1/user/connections/{connectionUserName}")
         Call<UsersResponse> removeConnection(@Path("connectionUserName") String connectionUserName);
 
-        @DELETE("api/v1/user/friends/{friendUserName}")
+        @DELETE("/api/v1/user/friends/{friendUserName}")
         Call<UsersResponse> removeFriend(@Path("friendUserName") String friendUserName);
 
-        @POST("api/v1/user/friends")
+        @POST("/api/v1/user/friends")
         Call<UsersResponse> addFriend(@Body BodyAddFriend friendUserName);
 
         /* response

android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java

@@ -22,7 +22,7 @@ import retrofit2.http.Query;
 
 public class UserStoryDomainProvider implements DomainProvider {
 
-    public static final String BASE_URL = "https://metaverse.highfidelity.com/";
+    public static final String BASE_URL = "https://metaverse.vircadia.com/live/";
 
     private static final String INCLUDE_ACTIONS_FOR_PLACES = "concurrency";
     private static final String INCLUDE_ACTIONS_FOR_FULL_SEARCH = "concurrency,announcements,snapshot";
@@ -169,7 +169,7 @@ public class UserStoryDomainProvider implements DomainProvider {
     }
 
     public interface UserStoryDomainProviderService {
-        @GET("api/v1/user_stories")
+        @GET("/api/v1/user_stories")
         Call<UserStories> getUserStories(@Query("include_actions") String includeActions,
                                          @Query("restriction") String restriction,
                                          @Query("require_online") boolean requireOnline,

android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java

@@ -15,8 +15,8 @@ import io.highfidelity.hifiinterface.HifiUtils;
  * available in an API
  */
 public class DownloadProfileImageTask extends AsyncTask<String, Void, String> {
-
-    private static final String BASE_PROFILE_URL = "https://highfidelity.com";
+    // Note: This should now be available in the API, correct?
+    private static final String BASE_PROFILE_URL = "https://metaverse.vircadia.com/live";
     private static final String TAG = "Interface";
 
     private final DownloadProfileImageResultProcessor mResultProcessor;

android/build.gradle

@@ -48,7 +48,7 @@ ext {
 
 def appDir = new File(projectDir, 'apps/interface')
 def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
-def baseUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/android/'
+def baseUrl = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
 def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms")
 
 task extractGvrBinaries() {

android/setupGVR.gradle

@@ -11,7 +11,7 @@ buildscript {
 
 
 def file='gvrsdk_v1.101.0.tgz'
-def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
+def url='https://cdn-1.vircadia.com/eu-c-1/vircadia-public/austin/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
 
 // FIXME find a way to only download if the file doesn't exist

assignment-client/src/Agent.cpp

@@ -112,11 +112,12 @@ Agent::Agent(ReceivedMessage& message) :
 
     packetReceiver.registerListenerForTypes(
         { PacketType::MixedAudio, PacketType::SilentAudioFrame },
-        this, "handleAudioPacket");
+        PacketReceiver::makeUnsourcedListenerReference<Agent>(this, &Agent::handleAudioPacket));
     packetReceiver.registerListenerForTypes(
         { PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
-        this, "handleOctreePacket");
-    packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat");
+        PacketReceiver::makeSourcedListenerReference<Agent>(this, &Agent::handleOctreePacket));
+    packetReceiver.registerListener(PacketType::SelectedAudioFormat,
+        PacketReceiver::makeUnsourcedListenerReference<Agent>(this, &Agent::handleSelectedAudioFormat));
 
     // 100Hz timer for audio
     const int TARGET_INTERVAL_MSEC = 10; // 10ms

assignment-client/src/AssignmentClient.cpp

@@ -118,8 +118,10 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
         setUpStatusToMonitor();
     }
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::CreateAssignment, this, "handleCreateAssignmentPacket");
-    packetReceiver.registerListener(PacketType::StopNode, this, "handleStopNodePacket");
+    packetReceiver.registerListener(PacketType::CreateAssignment,
+        PacketReceiver::makeUnsourcedListenerReference<AssignmentClient>(this, &AssignmentClient::handleCreateAssignmentPacket));
+    packetReceiver.registerListener(PacketType::StopNode,
+        PacketReceiver::makeUnsourcedListenerReference<AssignmentClient>(this, &AssignmentClient::handleStopNodePacket));
 }
 
 void AssignmentClient::stopAssignmentClient() {

assignment-client/src/AssignmentClientApp.cpp

@@ -183,7 +183,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     }
 
     QString assignmentServerHostname;
-    if (argumentVariantMap.contains(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION)) {
+    if (argumentVariantMap.contains(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION)) {
         assignmentServerHostname = argumentVariantMap.value(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION).toString();
     }
     if (parser.isSet(assignmentServerHostnameOption)) {
@@ -192,7 +192,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
 
     // check for an overriden assignment server port
     quint16 assignmentServerPort = DEFAULT_DOMAIN_SERVER_PORT;
-    if (argumentVariantMap.contains(ASSIGNMENT_WALLET_DESTINATION_ID_OPTION)) {
+    if (argumentVariantMap.contains(CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION)) {
         assignmentServerPort = argumentVariantMap.value(CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION).toUInt();
     }
 

assignment-client/src/AssignmentClientMonitor.cpp

@@ -72,7 +72,8 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen
     auto nodeList = DependencyManager::set<LimitedNodeList>(listenPort);
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::AssignmentClientStatus, this, "handleChildStatusPacket");
+    packetReceiver.registerListener(PacketType::AssignmentClientStatus,
+        PacketReceiver::makeUnsourcedListenerReference<AssignmentClientMonitor>(this, &AssignmentClientMonitor::handleChildStatusPacket));
 
     adjustOSResources(std::max(_numAssignmentClientForks, _maxAssignmentClientForks));
     // use QProcess to fork off a process for each of the child assignment clients

assignment-client/src/assets/AssetServer.cpp

@@ -308,7 +308,8 @@ AssetServer::AssetServer(ReceivedMessage& message) :
 
     // Queue all requests until the Asset Server is fully setup
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListenerForTypes({ PacketType::AssetGet, PacketType::AssetGetInfo, PacketType::AssetUpload, PacketType::AssetMappingOperation }, this, "queueRequests");
+    packetReceiver.registerListenerForTypes({ PacketType::AssetGet, PacketType::AssetGetInfo, PacketType::AssetUpload, PacketType::AssetMappingOperation },
+        PacketReceiver::makeSourcedListenerReference<AssetServer>(this, &AssetServer::queueRequests));
 
 #ifdef Q_OS_WIN
     updateConsumedCores();
@@ -464,10 +465,14 @@ void AssetServer::completeSetup() {
     qCDebug(asset_server) << "Overriding temporary queuing packet handler.";
     // We're fully setup, override the request queueing handler and replay all requests
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::AssetGet, this, "handleAssetGet");
-    packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo");
-    packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload");
-    packetReceiver.registerListener(PacketType::AssetMappingOperation, this, "handleAssetMappingOperation");
+    packetReceiver.registerListener(PacketType::AssetGet,
+        PacketReceiver::makeSourcedListenerReference<AssetServer>(this, &AssetServer::handleAssetGet));
+    packetReceiver.registerListener(PacketType::AssetGetInfo,
+        PacketReceiver::makeSourcedListenerReference<AssetServer>(this, &AssetServer::handleAssetGetInfo));
+    packetReceiver.registerListener(PacketType::AssetUpload,
+        PacketReceiver::makeSourcedListenerReference<AssetServer>(this, &AssetServer::handleAssetUpload));
+    packetReceiver.registerListener(PacketType::AssetMappingOperation,
+        PacketReceiver::makeSourcedListenerReference<AssetServer>(this, &AssetServer::handleAssetMappingOperation));
 
     replayRequests();
 }

assignment-client/src/audio/AudioMixer.cpp

@@ -101,20 +101,23 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
             PacketType::InjectorGainSet,
             PacketType::AudioSoloRequest,
             PacketType::StopInjector },
-            this, "queueAudioPacket");
+            PacketReceiver::makeSourcedListenerReference<AudioMixer>(this, &AudioMixer::queueAudioPacket)
+    );
 
     // packets whose consequences are global should be processed on the main thread
-    packetReceiver.registerListener(PacketType::MuteEnvironment, this, "handleMuteEnvironmentPacket");
-    packetReceiver.registerListener(PacketType::NodeMuteRequest, this, "handleNodeMuteRequestPacket");
-    packetReceiver.registerListener(PacketType::KillAvatar, this, "handleKillAvatarPacket");
+    packetReceiver.registerListener(PacketType::MuteEnvironment,
+        PacketReceiver::makeSourcedListenerReference<AudioMixer>(this, &AudioMixer::handleMuteEnvironmentPacket));
+    packetReceiver.registerListener(PacketType::NodeMuteRequest,
+        PacketReceiver::makeSourcedListenerReference<AudioMixer>(this, &AudioMixer::handleNodeMuteRequestPacket));
+    packetReceiver.registerListener(PacketType::KillAvatar,
+        PacketReceiver::makeSourcedListenerReference<AudioMixer>(this, &AudioMixer::handleKillAvatarPacket));
 
     packetReceiver.registerListenerForTypes({
         PacketType::ReplicatedMicrophoneAudioNoEcho,
         PacketType::ReplicatedMicrophoneAudioWithEcho,
         PacketType::ReplicatedInjectAudio,
-        PacketType::ReplicatedSilentAudioFrame
-    },
-        this, "queueReplicatedAudioPacket"
+        PacketType::ReplicatedSilentAudioFrame },
+        PacketReceiver::makeUnsourcedListenerReference<AudioMixer>(this, &AudioMixer::queueReplicatedAudioPacket)
     );
 
     connect(nodeList.data(), &NodeList::nodeKilled, this, &AudioMixer::handleNodeKilled);

assignment-client/src/audio/AudioMixerClientData.h

@@ -14,7 +14,10 @@
 
 #include <queue>
 
+#if !defined(Q_MOC_RUN)
+// Work around https://bugreports.qt.io/browse/QTBUG-80990
 #include <tbb/concurrent_vector.h>
+#endif
 
 #include <QtCore/QJsonObject>
 

assignment-client/src/audio/AudioMixerSlave.h

@@ -12,7 +12,10 @@
 #ifndef hifi_AudioMixerSlave_h
 #define hifi_AudioMixerSlave_h
 
+#if !defined(Q_MOC_RUN)
+// Work around https://bugreports.qt.io/browse/QTBUG-80990
 #include <tbb/concurrent_vector.h>
+#endif
 
 #include <AABox.h>
 #include <AudioHRTF.h>

assignment-client/src/avatars/AvatarMixer.cpp

@@ -71,26 +71,38 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) :
     connect(DependencyManager::get<NodeList>().data(), &NodeList::nodeKilled, this, &AvatarMixer::handleAvatarKilled);
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::AvatarData, this, "queueIncomingPacket");
-    packetReceiver.registerListener(PacketType::AdjustAvatarSorting, this, "handleAdjustAvatarSorting");
-    packetReceiver.registerListener(PacketType::AvatarQuery, this, "handleAvatarQueryPacket");
-    packetReceiver.registerListener(PacketType::AvatarIdentity, this, "handleAvatarIdentityPacket");
-    packetReceiver.registerListener(PacketType::KillAvatar, this, "handleKillAvatarPacket");
-    packetReceiver.registerListener(PacketType::NodeIgnoreRequest, this, "handleNodeIgnoreRequestPacket");
-    packetReceiver.registerListener(PacketType::RadiusIgnoreRequest, this, "handleRadiusIgnoreRequestPacket");
-    packetReceiver.registerListener(PacketType::RequestsDomainListData, this, "handleRequestsDomainListDataPacket");
-    packetReceiver.registerListener(PacketType::SetAvatarTraits, this, "queueIncomingPacket");
-    packetReceiver.registerListener(PacketType::BulkAvatarTraitsAck, this, "queueIncomingPacket");
+    packetReceiver.registerListener(PacketType::AvatarData,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::queueIncomingPacket));
+    packetReceiver.registerListener(PacketType::AdjustAvatarSorting,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleAdjustAvatarSorting));
+    packetReceiver.registerListener(PacketType::AvatarQuery,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleAvatarQueryPacket));
+    packetReceiver.registerListener(PacketType::AvatarIdentity,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleAvatarIdentityPacket));
+    packetReceiver.registerListener(PacketType::KillAvatar,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleKillAvatarPacket));
+    packetReceiver.registerListener(PacketType::NodeIgnoreRequest,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleNodeIgnoreRequestPacket));
+    packetReceiver.registerListener(PacketType::RadiusIgnoreRequest,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleRadiusIgnoreRequestPacket));
+    packetReceiver.registerListener(PacketType::RequestsDomainListData,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleRequestsDomainListDataPacket));
+    packetReceiver.registerListener(PacketType::SetAvatarTraits,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::queueIncomingPacket));
+    packetReceiver.registerListener(PacketType::BulkAvatarTraitsAck,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::queueIncomingPacket));
     packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
-        this, "handleOctreePacket");
-    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "queueIncomingPacket");
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleOctreePacket));
+    packetReceiver.registerListener(PacketType::ChallengeOwnership,
+        PacketReceiver::makeSourcedListenerReference<AvatarMixer>(this, &AvatarMixer::queueIncomingPacket));
 
     packetReceiver.registerListenerForTypes({
         PacketType::ReplicatedAvatarIdentity,
         PacketType::ReplicatedKillAvatar
-    }, this, "handleReplicatedPacket");
+    }, PacketReceiver::makeUnsourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleReplicatedPacket));
 
-    packetReceiver.registerListener(PacketType::ReplicatedBulkAvatarData, this, "handleReplicatedBulkAvatarPacket");
+    packetReceiver.registerListener(PacketType::ReplicatedBulkAvatarData,
+        PacketReceiver::makeUnsourcedListenerReference<AvatarMixer>(this, &AvatarMixer::handleReplicatedBulkAvatarPacket));
 
     auto nodeList = DependencyManager::get<NodeList>();
     connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &AvatarMixer::handlePacketVersionMismatch);

assignment-client/src/entities/EntityServer.cpp

@@ -59,8 +59,7 @@ EntityServer::EntityServer(ReceivedMessage& message) :
         PacketType::ChallengeOwnership,
         PacketType::ChallengeOwnershipRequest,
         PacketType::ChallengeOwnershipReply },
-        this,
-        "handleEntityPacket");
+        PacketReceiver::makeSourcedListenerReference<EntityServer>(this, &EntityServer::handleEntityPacket));
 
     connect(&_dynamicDomainVerificationTimer, &QTimer::timeout, this, &EntityServer::startDynamicDomainVerification);
     _dynamicDomainVerificationTimer.setSingleShot(true);

assignment-client/src/messages/MessagesMixer.cpp

@@ -25,9 +25,12 @@ MessagesMixer::MessagesMixer(ReceivedMessage& message) : ThreadedAssignment(mess
 {
     connect(DependencyManager::get<NodeList>().data(), &NodeList::nodeKilled, this, &MessagesMixer::nodeKilled);
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessages");
-    packetReceiver.registerListener(PacketType::MessagesSubscribe, this, "handleMessagesSubscribe");
-    packetReceiver.registerListener(PacketType::MessagesUnsubscribe, this, "handleMessagesUnsubscribe");
+    packetReceiver.registerListener(PacketType::MessagesData,
+        PacketReceiver::makeSourcedListenerReference<MessagesMixer>(this, &MessagesMixer::handleMessages));
+    packetReceiver.registerListener(PacketType::MessagesSubscribe,
+        PacketReceiver::makeSourcedListenerReference<MessagesMixer>(this, &MessagesMixer::handleMessagesSubscribe));
+    packetReceiver.registerListener(PacketType::MessagesUnsubscribe,
+        PacketReceiver::makeSourcedListenerReference<MessagesMixer>(this, &MessagesMixer::handleMessagesUnsubscribe));
 }
 
 void MessagesMixer::nodeKilled(SharedNodePointer killedNode) {

assignment-client/src/octree/OctreeServer.cpp

@@ -1122,8 +1122,10 @@ void OctreeServer::run() {
 
 void OctreeServer::domainSettingsRequestComplete() {
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::OctreeDataNack, this, "handleOctreeDataNackPacket");
-    packetReceiver.registerListener(getMyQueryMessageType(), this, "handleOctreeQueryPacket");
+    packetReceiver.registerListener(PacketType::OctreeDataNack,
+        PacketReceiver::makeSourcedListenerReference<OctreeServer>(this, &OctreeServer::handleOctreeDataNackPacket));
+    packetReceiver.registerListener(getMyQueryMessageType(),
+        PacketReceiver::makeSourcedListenerReference<OctreeServer>(this, &OctreeServer::handleOctreeQueryPacket));
 
     qDebug(octree_server) << "Received domain settings";
 

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -83,13 +83,18 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
-                                            this, "handleOctreePacket");
-    packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat");
+                                            PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleOctreePacket));
+    packetReceiver.registerListener(PacketType::SelectedAudioFormat,
+        PacketReceiver::makeUnsourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleSelectedAudioFormat));
 
-    packetReceiver.registerListener(PacketType::ReloadEntityServerScript, this, "handleReloadEntityServerScriptPacket");
-    packetReceiver.registerListener(PacketType::EntityScriptGetStatus, this, "handleEntityScriptGetStatusPacket");
-    packetReceiver.registerListener(PacketType::EntityServerScriptLog, this, "handleEntityServerScriptLogPacket");
-    packetReceiver.registerListener(PacketType::EntityScriptCallMethod, this, "handleEntityScriptCallMethodPacket");
+    packetReceiver.registerListener(PacketType::ReloadEntityServerScript,
+        PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleReloadEntityServerScriptPacket));
+    packetReceiver.registerListener(PacketType::EntityScriptGetStatus,
+        PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleEntityScriptGetStatusPacket));
+    packetReceiver.registerListener(PacketType::EntityServerScriptLog,
+        PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleEntityServerScriptLogPacket));
+    packetReceiver.registerListener(PacketType::EntityScriptCallMethod,
+        PacketReceiver::makeSourcedListenerReference<EntityScriptServer>(this, &EntityScriptServer::handleEntityScriptCallMethodPacket));
 
     static const int LOG_INTERVAL = MSECS_PER_SECOND / 10;
     auto timer = new QTimer(this);

cmake/macros/SetPackagingParameters.cmake

@@ -4,6 +4,7 @@
 #
 #  Created by Leonardo Murillo on 07/14/2015.
 #  Copyright 2015 High Fidelity, Inc.
+#  Copyright 2020 Vircadia contributors.
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -175,7 +176,7 @@ macro(SET_PACKAGING_PARAMETERS)
       set(INTERFACE_SHORTCUT_NAME "Vircadia")
       set(CONSOLE_SHORTCUT_NAME "Console")
       set(SANDBOX_SHORTCUT_NAME "Sandbox")
-      set(APP_USER_MODEL_ID "com.highfidelity.console")
+      set(APP_USER_MODEL_ID "com.vircadia.console")
     else ()
       set(INTERFACE_SHORTCUT_NAME "Vircadia - ${BUILD_VERSION_NO_SHA}")
       set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")

cmake/templates/CPackProperties.cmake.in

@@ -2,18 +2,19 @@
 #  CPackProperties.cmake.in
 #  cmake/templates
 #
-#  Copyright 2016 High Fidelity, Inc.
 #  Created by Stephen Birarda on January 11, 2016
+#  Copyright 2016 High Fidelity, Inc.
+#  Copyright 2020 Vircadia contributors.
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 #
 
-set(INTERFACE_DISPLAY_NAME "Interface")
+set(INTERFACE_DISPLAY_NAME "Vircadia")
 set(INTERFACE_SHORTCUT_NAME "@INTERFACE_SHORTCUT_NAME@")
 set(INTERFACE_HF_SHORTCUT_NAME "@INTERFACE_HF_SHORTCUT_NAME@")
 set(INTERFACE_WIN_EXEC_NAME "@INTERFACE_EXEC_PREFIX@.exe")
-set(CONSOLE_DISPLAY_NAME "Console")
+set(CONSOLE_DISPLAY_NAME "Vircadia Server Console")
 set(CONSOLE_INSTALL_SUBDIR "@CONSOLE_INSTALL_DIR@")
 set(CONSOLE_SHORTCUT_NAME "@CONSOLE_SHORTCUT_NAME@")
 set(CONSOLE_HF_SHORTCUT_NAME "@CONSOLE_HF_SHORTCUT_NAME@")
@@ -22,9 +23,9 @@ set(SANDBOX_HF_SHORTCUT_NAME "@SANDBOX_HF_SHORTCUT_NAME@")
 set(CONSOLE_WIN_EXEC_NAME "@CONSOLE_EXEC_NAME@")
 set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@")
 set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@")
-set(DS_DISPLAY_NAME "Domain Server")
+set(DS_DISPLAY_NAME "Vircadia Domain Server")
 set(DS_EXEC_NAME "@DS_EXEC_NAME@")
-set(AC_DISPLAY_NAME "Assignment Client")
+set(AC_DISPLAY_NAME "Vircadia Assignment Client")
 set(AC_EXEC_NAME "@AC_EXEC_NAME@")
 set(HIGH_FIDELITY_PROTOCOL "@HIGH_FIDELITY_PROTOCOL@")
 set(HIGH_FIDELITY_APP_PROTOCOL "@HIGH_FIDELITY_APP_PROTOCOL@")

cmake/templates/NSIS.template.in

@@ -636,6 +636,7 @@ Var Express
 
   ; figure out where to download installer slideshow images from
   StrCpy $0 "http://cdn.highfidelity.com/installer/slideshow"
+  ; Is this in use anymore?
 
   ${If} $CampaignName == ""
     StrCpy $0 "$0/default"
@@ -1300,13 +1301,13 @@ Section "-Core installation"
   ${If} @SERVER_COMPONENT_CONDITIONAL@
     ; handling for server console shortcut
     Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk"
-    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_SHORTCUT_NAME@.lnk" \
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk" \
       "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
     ; Set appUserModelId
-    ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
+    ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
   ${Else}
     ; handling for interface only console shortcut
-    Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_SHORTCUT_NAME@.lnk"
+    Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk"
     CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" \
       "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
     ; Set appUserModelId
@@ -1517,7 +1518,7 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\@INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\@CONSOLE_SHORTCUT_NAME@.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\@SANDBOX_SHORTCUT_NAME@.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\@SANDBOX_HF_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@SANDBOX_HF_SHORTCUT_NAME@.lnk"
@@ -1558,7 +1559,7 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\@INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\@CONSOLE_SHORTCUT_NAME@.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\@SANDBOX_SHORTCUT_NAME@.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\@SANDBOX_HF_SHORTCUT_NAME@.lnk"
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
   ;Delete empty start menu parent diretories

debian/rules

@@ -6,7 +6,7 @@
 
 override_dh_auto_configure:
 	mkdir obj-$(DEB_TARGET_MULTIARCH)
-	(cd obj-$(DEB_TARGET_MULTIARCH) && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/hifi -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCLIENT_ONLY=ON -DDOWNLOAD_SERVERLESS_CONTENT=ON -DCMAKE_CXX_COMPILER=/usr/lib/llvm-7/bin/clang\+\+ -DOpenGL_GL_PREFERENCE=GLVND)
+	(cd obj-$(DEB_TARGET_MULTIARCH) && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/hifi -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCLIENT_ONLY=ON -DDOWNLOAD_SERVERLESS_CONTENT=ON -DCMAKE_CXX_COMPILER=/usr/lib/llvm-7/bin/clang\+\+ -DOpenGL_GL_PREFERENCE=LEGACY)
 
 override_dh_auto_build:
 	(cd obj-$(DEB_TARGET_MULTIARCH) && make -j4)

domain-server/resources/describe-settings.json

@@ -8,20 +8,20 @@
         {
           "name": "access_token",
           "label": "Access Token",
-          "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
+          "help": "This is your OAuth access token to connect this domain-server with your Metaverse account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the Security page of your account on your Metaverse Server and generate a token with the 'domains' scope and paste it here.",
           "advanced": true,
           "backup": false
         },
         {
           "name": "id",
           "label": "Domain ID",
-          "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank.",
+          "help": "This is your Metaverse domain ID. If you do not want your domain to be registered in the Metaverse you can leave this blank.",
           "advanced": true
         },
         {
           "name": "automatic_networking",
           "label": "Automatic Networking",
-          "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
+          "help": "This defines how other nodes in the Metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
           "default": "disabled",
           "type": "select",
           "options": [
@@ -35,7 +35,7 @@
             },
             {
               "value": "disabled",
-              "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com"
+              "label": "None: use the network information I have entered for this domain at in the Metaverse Server."
             }
           ]
         },
@@ -50,7 +50,7 @@
         {
           "name": "enable_packet_verification",
           "label": "Enable Packet Verification",
-          "help": "Enable secure checksums on communication that uses the High Fidelity protocol. Increases security with possibly a small performance penalty.",
+          "help": "Enable secure checksums on communication that uses the Metaverse protocol. Increases security with possibly a small performance penalty.",
           "default": true,
           "type": "checkbox",
           "advanced":  true
@@ -160,7 +160,7 @@
       "name": "descriptors",
       "label": "Description",
       "restart": false,
-      "help": "This data will be queryable from your server. It may be collected by High Fidelity and used to share your domain with others.",
+      "help": "This data will be queryable from your server. It may be collected by the Metaverse and used to share your domain with others.",
       "settings": [
         {
           "name": "world_name",
@@ -1888,7 +1888,7 @@
           "name": "provider",
           "label": "Provider",
           "help": "OAuth provider URL.",
-          "default": "https://metaverse.highfidelity.com",
+          "default": "https://metaverse.vircadia.com/live",
           "advanced":  true,
           "backup": false
         },

domain-server/resources/web/js/shared.js

@@ -51,9 +51,9 @@ $.extend(Settings, {
 var URLs = {
   // STABLE METAVERSE_URL: https://metaverse.highfidelity.com
   // STAGING METAVERSE_URL: https://staging.highfidelity.com
-  METAVERSE_URL: 'https://metaverse.highfidelity.com',
-  CDN_URL: 'https://cdn.highfidelity.com',
-  PLACE_URL: 'https://hifi.place',
+  DEFAULT_METAVERSE_URL: "https://metaverse.vircadia.com/live",
+  CDN_URL: 'https://cdn-1.vircadia.com/eu-c-1',
+  PLACE_URL: 'https://xr.place'
 };
 
 var Strings = {
@@ -61,7 +61,7 @@ var Strings = {
 
   CHOOSE_DOMAIN_BUTTON: "Choose from my domains",
   CREATE_DOMAIN_BUTTON: "Create new domain ID",
-  CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connnected your High Fidelity account and created a new domain ID for this machine.",
+  CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connnected your Metaverse account and created a new domain ID for this machine.",
   CREATE_DOMAIN_SUCCESS: "We created a new domain ID for this machine.",
 
   // When a place modification fails, they will be brought back to the previous
@@ -92,7 +92,7 @@ var Strings = {
   ADD_PLACE_LOADING_DIALOG: "Loading your places...",
 
   ADD_PLACE_NOT_CONNECTED_TITLE: "Access token required",
-  ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your High Fidelity places.<br><br>Please follow the instructions on the settings page to add an access token.",
+  ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your Metaverse places.<br><br>Please follow the instructions on the settings page to add an access token.",
 };
 
 var DOMAIN_ID_TYPE_NONE = 0;
@@ -228,215 +228,214 @@ function getDomainFromAPI(callback) {
   return pendingDomainRequest;
 }
 
-function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAdded) {
+function chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded) {
   if (accessToken) {
+    getMetaverseUrl(function(metaverse_url) {
 
-    var loadingDialog = showLoadingDialog(Strings.ADD_PLACE_LOADING_DIALOG);
+      var loadingDialog = showLoadingDialog(Strings.ADD_PLACE_LOADING_DIALOG);
 
-    function loadPlaces() {
-      $.ajax("/api/places", {
-        dataType: 'json',
-        jsonp: false,
-        success: function(data) {
-          if (data.status == 'success') {
-            var modal_buttons = {
-              cancel: {
-                label: Strings.ADD_PLACE_CANCEL_BUTTON,
-                className: 'add-place-cancel-button btn-default'
-              }
-            };
-
-            var dialog;
-            var modal_body;
-
-            if (data.data.places.length) {
-              var places_by_id = {};
-
-              modal_body = $('<div>');
-
-              modal_body.append($("<p>Choose a place name that you own or <a href='" + URLs.METAVERSE_URL + "/user/places' target='_blank'>register a new place name</a></p>"));
-
-              var currentDomainIDType = getCurrentDomainIDType();
-              if (currentDomainIDType === DOMAIN_ID_TYPE_TEMP) {
-                var warning = "<div class='domain-loading-error alert alert-warning'>";
-                warning += "If you choose a place name it will replace your current temporary place name.";
-                warning += "</div>";
-                modal_body.append(warning);
-              }
-
-              // setup a select box for the returned places
-              modal_body.append($("<label for='place-name-select'>Places</label>"));
-              place_select = $("<select id='place-name-select' class='form-control'></select>");
-              _.each(data.data.places, function(place) {
-                places_by_id[place.id] = place;
-                place_select.append("<option value='" + place.id + "'>" + place.name + "</option>");
-              })
-              modal_body.append(place_select);
-              modal_body.append($("<p id='place-name-warning' class='warning-text' style='display: none'>This place name already points to a place or path. Saving this would overwrite the previous settings associated with it.</p>"));
-
-              if (forcePathTo === undefined || forcePathTo === null) {
-                var path = "<div class='form-group'>";
-                path += "<label for='place-path-input' class='control-label'>Path or Viewpoint</label>";
-                path += "<input type='text' id='place-path-input' class='form-control' value='/'>";
-                path += "</div>";
-                modal_body.append($(path));
-              }
-
-              var place_select = modal_body.find("#place-name-select")
-              place_select.change(function(ev) {
-                var warning = modal_body.find("#place-name-warning");
-                var place = places_by_id[$(this).val()];
-                if (place === undefined || place.pointee === null) {
-                  warning.hide();
-                } else {
-                  warning.show();
+      function loadPlaces() {
+        $.ajax("/api/places", {
+          dataType: 'json',
+          jsonp: false,
+          success: function(data) {
+            if (data.status == 'success') {
+              var modal_buttons = {
+                cancel: {
+                  label: Strings.ADD_PLACE_CANCEL_BUTTON,
+                  className: 'add-place-cancel-button btn-default'
                 }
-              });
-              place_select.trigger('change');
+              };
 
-              modal_buttons["success"] = {
-                label: Strings.ADD_PLACE_CONFIRM_BUTTON,
-                className: 'add-place-confirm-button btn btn-primary',
-                callback: function() {
-                  var placeID = $('#place-name-select').val();
-                  // set the place ID on the form
-                  $(Settings.place_ID_SELECTOR).val(placeID).change();
+              var dialog;
+              var modal_body;
+              if (data.data.places.length) {
+                var places_by_id = {};
 
-                  if (forcePathTo === undefined || forcePathTo === null) {
-                    var placePath = $('#place-path-input').val();
+                modal_body = $('<div>');
+
+                modal_body.append($("<p>Choose a place name that you own or <a href='" + metaverse_url + "/user/places' target='_blank'>register a new place name</a></p>"));
+
+                var currentDomainIDType = getCurrentDomainIDType();
+                if (currentDomainIDType === DOMAIN_ID_TYPE_TEMP) {
+                  var warning = "<div class='domain-loading-error alert alert-warning'>";
+                  warning += "If you choose a place name it will replace your current temporary place name.";
+                  warning += "</div>";
+                  modal_body.append(warning);
+                }
+
+                // setup a select box for the returned places
+                modal_body.append($("<label for='place-name-select'>Places</label>"));
+                place_select = $("<select id='place-name-select' class='form-control'></select>");
+                _.each(data.data.places, function(place) {
+                  places_by_id[place.id] = place;
+                  place_select.append("<option value='" + place.id + "'>" + place.name + "</option>");
+                })
+                modal_body.append(place_select);
+                modal_body.append($("<p id='place-name-warning' class='warning-text' style='display: none'>This place name already points to a place or path. Saving this would overwrite the previous settings associated with it.</p>"));
+
+                if (forcePathTo === undefined || forcePathTo === null) {
+                  var path = "<div class='form-group'>";
+                  path += "<label for='place-path-input' class='control-label'>Path or Viewpoint</label>";
+                  path += "<input type='text' id='place-path-input' class='form-control' value='/'>";
+                  path += "</div>";
+                  modal_body.append($(path));
+                }
+
+                var place_select = modal_body.find("#place-name-select")
+                place_select.change(function(ev) {
+                  var warning = modal_body.find("#place-name-warning");
+                  var place = places_by_id[$(this).val()];
+                  if (place === undefined || place.pointee === null) {
+                    warning.hide();
                   } else {
-                    var placePath = forcePathTo;
+                    warning.show();
                   }
+                });
+                place_select.trigger('change');
 
-                  $('.add-place-confirm-button').attr('disabled', 'disabled');
-                  $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON_PENDING);
-                  $('.add-place-cancel-button').attr('disabled', 'disabled');
+                modal_buttons["success"] = {
+                  label: Strings.ADD_PLACE_CONFIRM_BUTTON,
+                  className: 'add-place-confirm-button btn btn-primary',
+                  callback: function() {
+                    var placeID = $('#place-name-select').val();
+                    // set the place ID on the form
+                    $(Settings.place_ID_SELECTOR).val(placeID).change();
 
-                  function finalizeSaveDomainID(domainID) {
-                    var jsonSettings = {
-                      metaverse: {
-                        id: domainID
-                      }
-                    }
-                    var dialog = showLoadingDialog("Waiting for Domain Server to restart...");
-                    $.ajax('/settings.json', {
-                      data: JSON.stringify(jsonSettings),
-                      contentType: 'application/json',
-                      type: 'POST'
-                    }).done(function(data) {
-                      if (data.status == "success") {
-                        waitForDomainServerRestart(function() {
-                          dialog.modal('hide');
-                          if (onSuccessfullyAdded) {
-                            onSuccessfullyAdded(places_by_id[placeID].name, domainID);
-                          }
-                        });
-                      } else {
-                        bootbox.alert("Failed to add place");
-                      }
-                    }).fail(function() {
-                      bootbox.alert("Failed to add place");
-                    });
-                  }
-
-                  // If domainID is not specified, the current domain id will be used.
-                  function finishSettingUpPlace(domainID) {
-                    sendUpdatePlaceRequest(
-                      placeID,
-                      placePath,
-                      domainID,
-                      false,
-                      function(data) {
-                        dialog.modal('hide')
-                        if (domainID) {
-                          $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
-                          finalizeSaveDomainID(domainID);
-                        } else {
-                          if (onSuccessfullyAdded) {
-                            onSuccessfullyAdded(places_by_id[placeID].name);
-                          }
-                        }
-                      },
-                      function(data) {
-                        $('.add-place-confirm-button').removeAttr('disabled');
-                        $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
-                        $('.add-place-cancel-button').removeAttr('disabled');
-                        bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
-                      }
-                    );
-                  }
-
-                  function maybeCreateNewDomainID() {
-                    console.log("Maybe creating domain id", currentDomainIDType)
-                    if (currentDomainIDType === DOMAIN_ID_TYPE_FULL) {
-                      finishSettingUpPlace();
+                    if (forcePathTo === undefined || forcePathTo === null) {
+                      var placePath = $('#place-path-input').val();
                     } else {
-                      sendCreateDomainRequest(function(domainID) {
-                        console.log("Created domain", domainID);
-                        finishSettingUpPlace(domainID);
-                      }, function() {
-                        $('.add-place-confirm-button').removeAttr('disabled');
-                        $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
-                        $('.add-place-cancel-button').removeAttr('disabled');
-                        bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
+                      var placePath = forcePathTo;
+                    }
+
+                    $('.add-place-confirm-button').attr('disabled', 'disabled');
+                    $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON_PENDING);
+                    $('.add-place-cancel-button').attr('disabled', 'disabled');
+
+                    function finalizeSaveDomainID(domainID) {
+                      var jsonSettings = {
+                        metaverse: {
+                          id: domainID
+                        }
+                      }
+                      var dialog = showLoadingDialog("Waiting for Domain Server to restart...");
+                      $.ajax('/settings.json', {
+                        data: JSON.stringify(jsonSettings),
+                        contentType: 'application/json',
+                        type: 'POST'
+                      }).done(function(data) {
+                        if (data.status == "success") {
+                          waitForDomainServerRestart(function() {
+                            dialog.modal('hide');
+                            if (onSuccessfullyAdded) {
+                              onSuccessfullyAdded(places_by_id[placeID].name, domainID);
+                            }
+                          });
+                        } else {
+                          bootbox.alert("Failed to add place");
+                        }
+                      }).fail(function() {
+                        bootbox.alert("Failed to add place");
                       });
                     }
+
+                    // If domainID is not specified, the current domain id will be used.
+                    function finishSettingUpPlace(domainID) {
+                      sendUpdatePlaceRequest(
+                        placeID,
+                        placePath,
+                        domainID,
+                        false,
+                        function(data) {
+                          dialog.modal('hide')
+                          if (domainID) {
+                            $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+                            finalizeSaveDomainID(domainID);
+                          } else {
+                            if (onSuccessfullyAdded) {
+                              onSuccessfullyAdded(places_by_id[placeID].name);
+                            }
+                          }
+                        },
+                        function(data) {
+                          $('.add-place-confirm-button').removeAttr('disabled');
+                          $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
+                          $('.add-place-cancel-button').removeAttr('disabled');
+                          bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
+                        }
+                      );
+                    }
+
+                    function maybeCreateNewDomainID() {
+                      console.log("Maybe creating domain id", currentDomainIDType)
+                      if (currentDomainIDType === DOMAIN_ID_TYPE_FULL) {
+                        finishSettingUpPlace();
+                      } else {
+                        sendCreateDomainRequest(function(domainID) {
+                          console.log("Created domain", domainID);
+                          finishSettingUpPlace(domainID);
+                        }, function() {
+                          $('.add-place-confirm-button').removeAttr('disabled');
+                          $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
+                          $('.add-place-cancel-button').removeAttr('disabled');
+                          bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
+                        });
+                      }
+                    }
+
+                    maybeCreateNewDomainID();
+
+                    return false;
                   }
-
-                  maybeCreateNewDomainID();
-
-                  return false;
                 }
+              } else {
+                modal_buttons["success"] = {
+                  label: Strings.ADD_PLACE_NO_PLACES_BUTTON,
+                  callback: function() {
+                    window.open(metaverse_url + "/user/places", '_blank');
+                  }
+                }
+                modal_body = Strings.ADD_PLACE_NO_PLACES_MESSAGE;
               }
+              dialog = bootbox.dialog({
+                title: Strings.ADD_PLACE_TITLE,
+                message: modal_body,
+                closeButton: false,
+                buttons: modal_buttons,
+                onEscape: true
+              });
             } else {
-              modal_buttons["success"] = {
-                label: Strings.ADD_PLACE_NO_PLACES_BUTTON,
-                callback: function() {
-                  window.open(URLs.METAVERSE_URL + "/user/places", '_blank');
-                }
-              }
-              modal_body = Strings.ADD_PLACE_NO_PLACES_MESSAGE;
+              bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
             }
-
-            dialog = bootbox.dialog({
-              title: Strings.ADD_PLACE_TITLE,
-              message: modal_body,
-              closeButton: false,
-              buttons: modal_buttons,
-              onEscape: true
-            });
-          } else {
+          },
+          error: function() {
             bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
+          },
+          complete: function() {
+            loadingDialog.modal('hide');
           }
-        },
-        error: function() {
-          bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
-        },
-        complete: function() {
-          loadingDialog.modal('hide');
-        }
-      });
-    }
-
-    var domainType = getCurrentDomainIDType();
-    if (domainType !== DOMAIN_ID_TYPE_UNKNOWN) {
-      loadPlaces();
-    } else {
-      getDomainFromAPI(function(data) {
-        if (data.status === 'success') {
-          var domainType = getCurrentDomainIDType();
-          loadPlaces();
-        } else {
-          loadingDialog.modal('hide');
-          bootbox.confirm("We were not able to load your domain information from the Metaverse. Would you like to retry?", function(response) {
-            if (response) {
-              chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAdded);
-            }
-          });
-        }
-      })
-    }
+        });
+      }
 
+      var domainType = getCurrentDomainIDType();
+      if (domainType !== DOMAIN_ID_TYPE_UNKNOWN) {
+        loadPlaces();
+      } else {
+        getDomainFromAPI(function(data) {
+          if (data.status === 'success') {
+            var domainType = getCurrentDomainIDType();
+            loadPlaces();
+          } else {
+            loadingDialog.modal('hide');
+            bootbox.confirm("We were not able to load your domain information from the Metaverse. Would you like to retry?", function(response) {
+              if (response) {
+                chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded);
+              }
+            });
+          }
+        })
+      }
+    });
   } else {
     bootbox.alert({
       title: Strings.ADD_PLACE_NOT_CONNECTED_TITLE,
@@ -501,14 +500,38 @@ function prepareAccessTokenPrompt(callback) {
   });
 }
 
+function createDomainIDPrompt(callback) {
+  swal({
+    title: 'Finish Registering Domain',
+    type: 'input',
+    text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>This is a required step for registration.</br></br>',
+    showCancelButton: true,
+    confirmButtonText: "Create",
+    closeOnConfirm: false,
+    html: true
+  }, function (inputValue) {
+    if (inputValue === false) {
+      return false;
+    }
+
+    if (inputValue === "") {
+      swal.showInputError("Please enter a valid label for your machine.");
+      return false;
+    }
+
+    if (callback) {
+      callback(inputValue);
+    }
+  });
+}
+
 function getMetaverseUrl(callback) {
     $.ajax('/api/metaverse_info', {
       success: function(data) {
         callback(data.metaverse_url);
       },
       error: function() {
-        callback(URLs.METAVERSE_URL);
+        callback(URLs.DEFAULT_METAVERSE_URL);
       }
     });
 }
-

domain-server/resources/web/settings/js/settings.js

@@ -16,7 +16,7 @@ $(document).ready(function(){
 
   Settings.extraGroupsAtEnd = Settings.extraDomainGroupsAtEnd;
   Settings.extraGroupsAtIndex = Settings.extraDomainGroupsAtIndex;
-  var METAVERSE_URL = URLs.METAVERSE_URL;
+  var METAVERSE_URL = URLs.DEFAULT_METAVERSE_URL;
 
   var SSL_PRIVATE_KEY_FILE_ID = 'ssl-private-key-file';
   var SSL_PRIVATE_KEY_CONTENTS_ID = 'key-contents';
@@ -40,6 +40,8 @@ $(document).ready(function(){
 
       // call our method to setup the place names table
       setupPlacesTable();
+      // hide the places table for now because we do not want that interacted with from the domain-server
+      $('#' + Settings.PLACES_TABLE_ID).hide();
 
       setupDomainNetworkingSettings();
       // setupDomainLabelSetting();
@@ -277,7 +279,7 @@ $(document).ready(function(){
             swal({
               title: '',
               type: 'error',
-              text: "There was a problem retrieving domain information from High Fidelity API.",
+              text: "There was a problem retrieving domain information from the Metaverse API.",
               confirmButtonText: 'Try again',
               showCancelButton: true,
               closeOnConfirm: false
@@ -306,7 +308,7 @@ $(document).ready(function(){
 
     if (hasAccessToken) {
       el = "<p>";
-      el += "<span class='account-connected-header'>High Fidelity Account Connected</span>";
+      el += "<span class='account-connected-header'>Metaverse Account Connected</span>";
       el += "<button id='" + Settings.DISCONNECT_ACCOUNT_BTN_ID + "' class='btn'>Disconnect</button>";
       el += "</p>";
       el = $(el);
@@ -319,7 +321,7 @@ $(document).ready(function(){
       }
       buttonSetting.help = "";
       buttonSetting.classes = "btn-primary";
-      buttonSetting.button_label = "Connect High Fidelity Account";
+      buttonSetting.button_label = "Connect Metaverse Account";
       buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID;
 
       buttonSetting.href = METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
@@ -387,7 +389,7 @@ $(document).ready(function(){
 
     $.post("/api/domains", domainJSON, function(data){
       // we successfully created a domain ID, set it on that field
-      var domainID = data.domain.id;
+      var domainID = data.domain.domainId;
       console.log("Setting domain id to ", data, domainID);
       $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
 
@@ -711,9 +713,9 @@ $(document).ready(function(){
       name: 'places',
       label: 'Places',
       html_id: Settings.PLACES_TABLE_ID,
-      help: "The following places currently point to this domain.</br>To point places to this domain, "
-        + " go to the <a href='" + METAVERSE_URL + "/user/places'>My Places</a> "
-        + "page in your High Fidelity Metaverse account.",
+      help: "To point places to this domain, "
+        + " go to the <a href='" + METAVERSE_URL + "/user/places'>Places</a> "
+        + "page in your Metaverse account.",
       read_only: true,
       can_add_new_rows: false,
       columns: [
@@ -745,9 +747,10 @@ $(document).ready(function(){
     var errorEl = createDomainLoadingError("There was an error retrieving your places.");
     $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
 
-    var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
-    temporaryPlaceButton.hide();
-    $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
+    // DISABLE TEMP PLACE NAME BUTTON...
+    // var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
+    // temporaryPlaceButton.hide();
+    // $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
     if (accessTokenIsSet()) {
       appendAddButtonToPlacesTable();
     }
@@ -853,7 +856,7 @@ $(document).ready(function(){
         }
         // Update label
         if (showOrHideLabel()) {
-          var label = data.domain.label;
+          var label = data.domain.name;
           label = label === null ? '' : label;
           $('#network-label').val(label);
         }
@@ -959,7 +962,7 @@ $(document).ready(function(){
       var addRow = $("<tr> <td></td> <td></td> <td class='buttons'><a href='#' class='place-add glyphicon glyphicon-plus'></a></td> </tr>");
       addRow.find(".place-add").click(function(ev) {
         ev.preventDefault();
-        chooseFromHighFidelityPlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
+        chooseFromMetaversePlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
           if (newDomainID) {
             Settings.data.values.metaverse.id = newDomainID;
             var domainIDEl = $("[data-keypath='metaverse.id']");
@@ -997,18 +1000,18 @@ $(document).ready(function(){
 
           if (data.data.domains.length) {
             // setup a select box for the returned domains
-            modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
+            modal_body = "<p>Choose the Metaverse domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
             domain_select = $("<select id='domain-name-select' class='form-control'></select>");
             _.each(data.data.domains, function(domain){
               var domainString = "";
 
-              if (domain.label) {
-                domainString += '"' + domain.label+ '" - ';
+              if (domain.name) {
+                domainString += '"' + domain.name+ '" - ';
               }
 
-              domainString += domain.id;
+              domainString += domain.domainId;
 
-              domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
+              domain_select.append("<option value='" + domain.domainId + "'>" + domainString + "</option>");
             })
             modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
             modal_buttons["success"] = {
@@ -1026,7 +1029,7 @@ $(document).ready(function(){
                 window.open(METAVERSE_URL + "/user/domains", '_blank');
               }
             }
-            modal_body = "<p>You do not have any domains in your High Fidelity account." +
+            modal_body = "<p>You do not have any domains in your Metaverse account." +
               "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
           }
 
@@ -1038,7 +1041,7 @@ $(document).ready(function(){
           })
         },
         error: function() {
-          bootbox.alert("Failed to retrieve your domains from the High Fidelity Metaverse");
+          bootbox.alert("Failed to retrieve your domains from the Metaverse");
         },
         complete: function() {
           // remove the spinner from the choose button
@@ -1049,7 +1052,7 @@ $(document).ready(function(){
 
       } else {
         bootbox.alert({
-          message: "You must have an access token to query your High Fidelity domains.<br><br>" +
+          message: "You must have an access token to query your Metaverse domains.<br><br>" +
           "Please follow the instructions on the settings page to add an access token.",
           title: "Access token required"
         })

domain-server/resources/web/wizard/index.shtml

@@ -3,12 +3,12 @@
   <h4 class="step-title"></h4>
   <dl class="row">
     <dd class="col-md-12">
-      <span class='step-description'>By connecting your High Fidelity Account you will be granting access to your account information.</span>
+      <span class='step-description'>By connecting your Metaverse Account you will be granting access to your account information.</span>
     </dd>
   </dl>
   <dl class="row">
     <dd class="col-md-12">
-      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your High Fidelity account</a>
+      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your Metaverse account</a>
     </dd>
   </dl>
 
@@ -19,13 +19,13 @@
   </dl>
 </div>
 
-<div class="wizard-step col-md-8 col-centered" style="display: none;">
+<!-- <div class="wizard-step col-md-8 col-centered" style="display: none;">
   <h4 class="step-title"></h4>
   <div class="row">
     <div class="col-md-12">
       <span class='step-description'>
         <a target='_blank' href='https://docs.vircadia.dev/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
-        enter its Place Name in High Fidelity's Interface. You can choose a Place Name for your domain.</br>
+        enter its Place Name in Vircadia's Interface. You can choose a Place Name for your domain.</br>
         Your domain may also be reachable by <b>IP address</b>.
       </span>
     </div>
@@ -51,16 +51,16 @@
       <button type="button" class="btn btn-md btn-block btn-primary next-button">Next</button>
     </dd>
   </dl>
-</div>
+</div> -->
 
 <div class="wizard-step col-md-9 col-centered" style="display: none;">
   <h4 class="step-title"></h4>
   <div class="row">
-    <p id="permissions-description" class="col-md-12 step-info"><b>Localhost</b> has been granted administrator privileges to this domain. (Localhost is any</br>user on the same machine as the High Fidelity Server)</p>
+    <p id="permissions-description" class="col-md-12 step-info"><b>Localhost</b> has been granted administrator privileges to this domain. (Localhost is any</br>user on the same machine as the Vircadia server)</p>
   </div>
   <div id="admin-row" class="row">
     <p class="col-md-6">
-      <span class="step-info"><span id="admin-description"><b>Add your High Fidelity username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
+      <span class="step-info"><span id="admin-description"><b>Add your Metaverse username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
     </p>
     <div class="col-md-6">
       <input id="admin-usernames" type="text" class="form-control">
@@ -95,7 +95,7 @@
     </p>
     <p class="col-md-5">
       <label>
-        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into High Fidelity
+        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into the Metaverse
       </label>
     </p>
     <p class="col-md-2">
@@ -126,7 +126,7 @@
     </p>
     <p class="col-md-5">
       <label>
-        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into High Fidelity
+        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into the Metaverse
       </label>
     </p>
     <p class="col-md-2">
@@ -164,14 +164,14 @@
     <dt class="col-md-4 step-info">Username</dt>
     <dd class="col-md-8">
       <input id="http_username" type="text" class="form-control">
-      <span class='help-block'>This does not have to be your High Fidelity username</span>
+      <span class='help-block'>This does not have to be your Metaverse username</span>
     </dd>
   </dl>
   <dl class="row">
     <dt class="col-md-4 step-info">Enter password</dt>
     <dd class="col-md-8">
       <input id="http_password" type="password" class="form-control">
-      <span class='help-block'>This should not be the same as your High Fidelity password</span>
+      <span class='help-block'>This should not be the same as your Metaverse password</span>
     </dd>
   </dl>
   <dl id="verify-password-row" class="row">
@@ -186,7 +186,37 @@
       <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
     </dd>
     <dd class="col-md-3 col-md-offset-6">
-      <button id="save-username-password" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
+      <button id="save-username-password" type="button" class="btn btn-md btn-block btn-primary next-button">Next</button>
+    </dd>
+  </dl>
+</div>
+
+<div class="wizard-step col-md-8 col-centered" style="display: none;">
+  <h4 class="step-title"></h4>
+  <div class="row">
+    <div class="col-md-12">
+      <span class='step-description'>
+        Would you like use automatic threading for your server's avatars and audio? 
+        If you are hosting this server on your local computer and it is not very powerful, then consider leaving this off because the server will use more resources if it is being utilized extensively, thereby slowing down your computer. 
+        If you are running this server on a powerful system and intend to have a large audience, then turn this setting on.
+      </span>
+    </div>
+  </div>
+  <br />
+  <div id="automatic-threading-options-row" class="row">
+    <p class="col-md-12">
+      <label>
+        <input id="enable-automatic-threading" name="threading-checkbox" type="checkbox" value="true"> Enable Automatic Threading
+      </label>
+    </p>
+  </div>
+
+  <dl class="row">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
+      <button id="save-threading-settings" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
     </dd>
   </dl>
 </div>
@@ -201,7 +231,7 @@
 
   <div class="row">
     <div class="col-xs-10 col-xs-offset-1">
-      <p id="main-description" class="step-info">You have successfully setup and configured your cloud hosted domain.</p>
+      <p id="main-description" class="step-info">You have successfully setup and configured your Vircadia domain.</p>
     </div>
   </div>
 
@@ -262,4 +292,5 @@
 <script src='/js/bootbox.min.js'></script>
 <script src='/js/sha256.js'></script>
 <script src='js/wizard.js'></script>
+<script src='../js/shared.js'></script>
 <!--#include virtual="page-end.html"-->

domain-server/resources/web/wizard/js/wizard.js

@@ -2,121 +2,132 @@ var Metaverse = {
   accessToken: null
 }
 
+var CURRENT_METAVERSE_URL;
+
 var currentStepNumber;
 
 $(document).ready(function(){
-  Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" +
-    "Please go back and connect your account.";
+  getMetaverseUrl(function(metaverse_url) {
+    CURRENT_METAVERSE_URL = metaverse_url;
 
-  $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
+    Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your Metaverse places.<br><br>" +
+      "Please go back and connect your account.";
 
-  $('[data-toggle="tooltip"]').tooltip();
+    $('#connect-account-btn').attr('href', CURRENT_METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
 
-  $('.perms-link').on('click', function() {
-    var modal_body = '<div>';
-    modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
-    modal_body += '<b>Friends</b> - Users who are your Friends in High Fidelity.</br></br>';
-    modal_body += '<b>Users logged into High Fidelity</b> - Users who are currently logged into High Fidelity.</br></br>';
-    modal_body += '<b>Everyone</b> - Anyone who uses High Fidelity.';
-    modal_body += '</div>';
+    $('[data-toggle="tooltip"]').tooltip();
 
-    dialog = bootbox.dialog({
-      title: "User definition",
-      message: modal_body,
-      closeButton: true
+    $('.perms-link').on('click', function() {
+      var modal_body = '<div>';
+      modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
+      modal_body += '<b>Friends</b> - Users who are your Friends in the Metaverse.</br></br>';
+      modal_body += '<b>Users logged into the Metaverse</b> - Users who are currently logged into the Metaverse.</br></br>';
+      modal_body += '<b>Everyone</b> - Anyone who uses the Metaverse.';
+      modal_body += '</div>';
+
+      dialog = bootbox.dialog({
+        title: "User definition",
+        message: modal_body,
+        closeButton: true
+      });
+      return false;
     });
-    return false;
-  });
 
-  $('body').on('click', '.next-button', function() {
-    goToNextStep();
-  });
-
-  $('body').on('click', '.back-button', function() {
-    goToPreviousStep();
-  });
-
-  $('body').on('click', '#skip-wizard-button', function() {
-    skipWizard();
-  })
-
-  $('body').on('click', '#connect-account-btn', function() {
-    $(this).blur();
-    prepareAccessTokenPrompt(function(accessToken) {
-      Metaverse.accessToken = accessToken;
-      saveAccessToken();
+    $('body').on('click', '.next-button', function() {
+      goToNextStep();
     });
-  });
 
+    $('body').on('click', '.back-button', function() {
+      goToPreviousStep();
+    });
+
+    $('body').on('click', '#skip-wizard-button', function() {
+      skipWizard();
+    })
+
+    $('body').on('click', '#connect-account-btn', function() {
+      $(this).blur();
+      prepareAccessTokenPrompt(function(accessToken) {
+        Metaverse.accessToken = accessToken;
+        saveAccessToken();
+        promptToCreateDomainID();
+      });
+    });
+  
   $('body').on('click', '#save-permissions', function() {
     savePermissions();
   });
-
-  function triggerSaveUsernamePassword(event) {
-      if (event.keyCode === 13) {
-          $("#save-username-password").click();
-      }
-  }
-  $("#http_username").keyup(triggerSaveUsernamePassword);
-  $("#http_password").keyup(triggerSaveUsernamePassword);
-  $("#verify_http_password").keyup(triggerSaveUsernamePassword);
-  $('body').on('click', '#save-username-password', function() {
-    saveUsernamePassword();
+  
+  $('body').on('click', '#save-threading-settings', function() {
+    saveThreadingSettings();
   });
 
-  $('body').on('click', '#change-place-name', function() {
-    chooseFromHighFidelityPlaces(Settings.data.values.metaverse.access_token, "/0,-10,0", function(placeName) {
-      updatePlaceNameLink(placeName);
-    });
-  });
-
-  $('body').on('click', '#visit-domain', function() {
-    $('#share-link')[0].click();
-  });
-
-  $('input[type=radio][name=connect-radio]').change(function() {
-    var inputs = $('input[type=radio][name=rez-radio]');
-    var disabled = [];
-
-    switch (this.value) {
-      case 'none':
-        disabled = inputs.splice(1);
-        break;
-      case 'friends':
-        disabled = inputs.splice(2);
-        break;
-      case 'logged-in':
-        disabled = inputs.splice(3);
-        break;
-      case 'everyone':
-        disabled = inputs.splice(4);
-        break;
+    function triggerSaveUsernamePassword(event) {
+        if (event.keyCode === 13) {
+            $("#save-username-password").click();
+        }
     }
-
-    $.each(inputs, function() {
-      $(this).prop('disabled', false);
+    $("#http_username").keyup(triggerSaveUsernamePassword);
+    $("#http_password").keyup(triggerSaveUsernamePassword);
+    $("#verify_http_password").keyup(triggerSaveUsernamePassword);
+    $('body').on('click', '#save-username-password', function() {
+      saveUsernamePassword();
     });
-    $.each(disabled, function() {
-      if ($(this).prop('checked')) {
-        $(inputs.last()).prop('checked', true);
-      }
-      $(this).prop('disabled', true);
-    });
-  });
 
-  reloadSettings(function(success) {
-    if (success) {
-      getDomainFromAPI();
-      setupWizardSteps();
-      updatePlaceNameDisplay();
-      updateUsernameDisplay();
-    } else {
-      swal({
-        title: '',
-        type: 'error',
-        text: "There was a problem loading the domain settings.\nPlease refresh the page to try again.",
+    $('body').on('click', '#change-place-name', function() {
+      chooseFromMetaversePlaces(Settings.data.values.metaverse.access_token, "/0,-10,0", function(placeName) {
+        updatePlaceNameLink(placeName);
       });
-    }
+    });
+
+    $('body').on('click', '#visit-domain', function() {
+      $('#share-link')[0].click();
+    });
+
+    $('input[type=radio][name=connect-radio]').change(function() {
+      var inputs = $('input[type=radio][name=rez-radio]');
+      var disabled = [];
+
+      switch (this.value) {
+        case 'none':
+          disabled = inputs.splice(1);
+          break;
+        case 'friends':
+          disabled = inputs.splice(2);
+          break;
+        case 'logged-in':
+          disabled = inputs.splice(3);
+          break;
+        case 'everyone':
+          disabled = inputs.splice(4);
+          break;
+      }
+
+      $.each(inputs, function() {
+        $(this).prop('disabled', false);
+      });
+      $.each(disabled, function() {
+        if ($(this).prop('checked')) {
+          $(inputs.last()).prop('checked', true);
+        }
+        $(this).prop('disabled', true);
+      });
+    });
+
+    reloadSettings(function(success) {
+      if (success) {
+        getDomainFromAPI();
+        setupWizardSteps();
+        updatePlaceNameDisplay();
+        updateUsernameDisplay();
+      } else {
+        swal({
+          title: '',
+          type: 'error',
+          text: "There was a problem loading the domain settings.\nPlease refresh the page to try again.",
+        });
+      }
+    });
   });
 });
 
@@ -142,10 +153,10 @@ function setupWizardSteps() {
     });
 
     $('#permissions-description').html('You <span id="username-display"></span>have been assigned administrator privileges to this domain.');
-    $('#admin-description').html('Add more High Fidelity usernames');
+    $('#admin-description').html('Add more Metaverse usernames');
   } else {
     $('.cloud-only').remove();
-    $('#save-permissions').text("Finish");
+    $('#save-threading-settings').text("Finish");
 
     steps = $('.wizard-step');
     $(steps).each(function(i) {
@@ -161,6 +172,45 @@ function setupWizardSteps() {
   $(currentStep).show();
 }
 
+function promptToCreateDomainID() {
+  setTimeout(function () {
+    createDomainIDPrompt(function (label) {
+      var domainJSON = {
+        "label": label
+      };
+
+      $.post("/api/domains", domainJSON, function (data) {
+        if (data.status === "failure") {
+          swal.showInputError("Error: " + data.error);
+          return;
+        }
+        
+        swal.close();
+
+        // we successfully created a domain ID, set it on that field
+        var domainID = data.domain.domainId;
+        console.log("Setting domain ID to ", data, domainID);
+
+        var formJSON = {
+          "metaverse": {
+            "id": domainID
+          }
+        };
+
+        // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+        postSettings(formJSON, goToNextStep);
+      }, 'json').fail(function (data) {
+        if (data && data.status === "failure") {
+          swal.showInputError("Error: " + data.error);
+        } else {
+          swal.showInputError("Error: Failed to post to metaverse.");
+        }
+        console.log("Failed to create domain ID...");
+      });
+    });
+  }, 500); // Apparently swal needs time before opening another prompt.
+}
+
 function updatePlaceNameLink(address) {
   if (address) {
     var url = URLs.PLACE_URL + '/' + address;
@@ -171,7 +221,7 @@ function updatePlaceNameLink(address) {
 
 function updatePlaceNameDisplay() {
   if (Settings.data.values.metaverse.id) {
-    $.getJSON(URLs.METAVERSE_URL + '/api/v1/domains/' + Settings.data.values.metaverse.id, function(data) {
+    $.getJSON(CURRENT_METAVERSE_URL + '/api/v1/domains/' + Settings.data.values.metaverse.id, function(data) {
 
       if (data.status === 'success') {
         if (data.domain.default_place_name) {
@@ -254,10 +304,6 @@ function goToNextStep() {
   var currentStep = $('body').find('.wizard-step:visible');
   var nextStep = currentStep.next('.wizard-step');
 
-  var formJSON = {
-    "wizard": {}
-  }
-
   if (nextStep.length > 0) {
     currentStep.hide();
     nextStep.show();
@@ -335,7 +381,7 @@ function saveAccessToken() {
   $(this).blur();
 
   // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-  postSettings(formJSON, goToNextStep);
+  postSettings(formJSON);
 }
 
 function getSettingDescriptionForKey(groupKey, settingKey) {
@@ -515,7 +561,29 @@ function saveUsernamePassword() {
   $(this).blur();
 
   // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-  postSettings(formJSON, function() {
-    location.reload();
-  });
+  postSettings(formJSON, goToNextStep);
+}
+
+function saveThreadingSettings() {
+    var enable_automatic_threading = $("#enable-automatic-threading").prop("checked");
+    
+    currentStepNumber += 1;
+  
+    var formJSON = {
+      "audio_threading": {
+        "auto_threads": enable_automatic_threading
+      },
+      "avatar_mixer": {
+        "auto_threads": enable_automatic_threading
+      },
+      "wizard": {
+        "steps_completed": currentStepNumber.toString()
+      }
+    }
+  
+    // remove focus from the button
+    $(this).blur();
+  
+    // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+    postSettings(formJSON, goToNextStep);
 }

domain-server/src/DomainGatekeeper.cpp

@@ -17,7 +17,8 @@
 #include <openssl/x509.h>
 #include <random>
 
-#include <QDataStream>
+#include <QtCore/QDataStream>
+#include <QtCore/QMetaMethod>
 
 #include <AccountManager.h>
 #include <Assignment.h>
@@ -821,7 +822,7 @@ void DomainGatekeeper::requestUserPublicKey(const QString& username, bool isOpti
     callbackParams.errorCallbackMethod = "publicKeyJSONErrorCallback";
 
 
-    const QString USER_PUBLIC_KEY_PATH = "api/v1/users/%1/public_key";
+    const QString USER_PUBLIC_KEY_PATH = "/api/v1/users/%1/public_key";
 
     qDebug().nospace() << "Requesting " << (isOptimistic ? "optimistic " : " ") << "public key for user " << username;
 
@@ -1048,7 +1049,7 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) {
     callbackParams.jsonCallbackMethod = "getIsGroupMemberJSONCallback";
     callbackParams.errorCallbackMethod = "getIsGroupMemberErrorCallback";
 
-    const QString GET_IS_GROUP_MEMBER_PATH = "api/v1/groups/members/%2";
+    const QString GET_IS_GROUP_MEMBER_PATH = "/api/v1/groups/members/%2";
     DependencyManager::get<AccountManager>()->sendRequest(GET_IS_GROUP_MEMBER_PATH.arg(username),
                                                           AccountManagerAuth::Required,
                                                           QNetworkAccessManager::PostOperation, callbackParams,
@@ -1114,7 +1115,7 @@ void DomainGatekeeper::getDomainOwnerFriendsList() {
     callbackParams.jsonCallbackMethod = "getDomainOwnerFriendsListJSONCallback";
     callbackParams.errorCallbackMethod = "getDomainOwnerFriendsListErrorCallback";
 
-    const QString GET_FRIENDS_LIST_PATH = "api/v1/user/friends";
+    const QString GET_FRIENDS_LIST_PATH = "/api/v1/user/friends";
     if (DependencyManager::get<AccountManager>()->hasValidAccessToken()) {
         DependencyManager::get<AccountManager>()->sendRequest(GET_FRIENDS_LIST_PATH, AccountManagerAuth::Required,
                                                               QNetworkAccessManager::GetOperation, callbackParams, QByteArray(),
@@ -1196,7 +1197,7 @@ Node::LocalID DomainGatekeeper::findOrCreateLocalID(const QUuid& uuid) {
         return existingLocalIDIt->second;
     }
 
-    assert(_localIDs.size() < std::numeric_limits<LocalIDs::value_type>::max() - 2);
+    assert(_localIDs.size() < (size_t)(std::numeric_limits<LocalIDs::value_type>::max() - 2));
 
     Node::LocalID newLocalID;
     do {

domain-server/src/DomainMetadata.cpp

@@ -230,7 +230,7 @@ void DomainMetadata::maybeUpdateUsers() {
 }
 
 void DomainMetadata::sendDescriptors() {
-    QString domainUpdateJSON = QString("{\"domain\":{\"meta\":%1}").arg(QString(QJsonDocument(get(DESCRIPTORS)).toJson(QJsonDocument::Compact)));
+    QString domainUpdateJSON = QString("{\"domain\":{\"meta\":%1}}").arg(QString(QJsonDocument(get(DESCRIPTORS)).toJson(QJsonDocument::Compact)));
     const QUuid& domainID = DependencyManager::get<LimitedNodeList>()->getSessionUUID();
     if (!domainID.isNull()) {
         static const QString DOMAIN_UPDATE = "/api/v1/domains/%1";

domain-server/src/DomainMetadata.h

@@ -4,6 +4,7 @@
 //
 //  Created by Zach Pomerantz on 5/25/2016.
 //  Copyright 2016 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

domain-server/src/DomainServer.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 9/26/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -118,7 +119,7 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
     root.insert(requestSubobjectKey, subobject);
     QJsonDocument doc { root };
 
-    QUrl url{ MetaverseAPI::getCurrentMetaverseServerURL().toString() + metaversePath };
+    QUrl url { MetaverseAPI::getCurrentMetaverseServerURL().toString() + metaversePath };
 
     QNetworkRequest req(url);
     req.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT);
@@ -339,7 +340,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
 void DomainServer::parseCommandLine(int argc, char* argv[]) {
     QCommandLineParser parser;
-    parser.setApplicationDescription("High Fidelity Domain Server");
+    parser.setApplicationDescription("Vircadia Domain Server");
     const QCommandLineOption versionOption = parser.addVersionOption();
     const QCommandLineOption helpOption = parser.addHelpOption();
 
@@ -777,32 +778,51 @@ void DomainServer::setupNodeListAndAssignments() {
 
     // register as the packet receiver for the types we want
     PacketReceiver& packetReceiver = nodeList->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::RequestAssignment, this, "processRequestAssignmentPacket");
-    packetReceiver.registerListener(PacketType::DomainListRequest, this, "processListRequestPacket");
-    packetReceiver.registerListener(PacketType::DomainServerPathQuery, this, "processPathQueryPacket");
-    packetReceiver.registerListener(PacketType::NodeJsonStats, this, "processNodeJSONStatsPacket");
-    packetReceiver.registerListener(PacketType::DomainDisconnectRequest, this, "processNodeDisconnectRequestPacket");
-    packetReceiver.registerListener(PacketType::AvatarZonePresence, this, "processAvatarZonePresencePacket");
+    packetReceiver.registerListener(PacketType::RequestAssignment,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processRequestAssignmentPacket));
+    packetReceiver.registerListener(PacketType::DomainListRequest,
+        PacketReceiver::makeSourcedListenerReference<DomainServer>(this, &DomainServer::processListRequestPacket));
+    packetReceiver.registerListener(PacketType::DomainServerPathQuery,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processPathQueryPacket));
+    packetReceiver.registerListener(PacketType::NodeJsonStats,
+        PacketReceiver::makeSourcedListenerReference<DomainServer>(this, &DomainServer::processNodeJSONStatsPacket));
+    packetReceiver.registerListener(PacketType::DomainDisconnectRequest,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processNodeDisconnectRequestPacket));
+    packetReceiver.registerListener(PacketType::AvatarZonePresence,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processAvatarZonePresencePacket));
 
     // NodeList won't be available to the settings manager when it is created, so call registerListener here
-    packetReceiver.registerListener(PacketType::DomainSettingsRequest, &_settingsManager, "processSettingsRequestPacket");
-    packetReceiver.registerListener(PacketType::NodeKickRequest, &_settingsManager, "processNodeKickRequestPacket");
-    packetReceiver.registerListener(PacketType::UsernameFromIDRequest, &_settingsManager, "processUsernameFromIDRequestPacket");
+    packetReceiver.registerListener(PacketType::DomainSettingsRequest,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServerSettingsManager>(&_settingsManager, &DomainServerSettingsManager::processSettingsRequestPacket));
+    packetReceiver.registerListener(PacketType::NodeKickRequest,
+        PacketReceiver::makeSourcedListenerReference<DomainServerSettingsManager>(&_settingsManager, &DomainServerSettingsManager::processNodeKickRequestPacket));
+    packetReceiver.registerListener(PacketType::UsernameFromIDRequest,
+        PacketReceiver::makeSourcedListenerReference<DomainServerSettingsManager>(&_settingsManager, &DomainServerSettingsManager::processUsernameFromIDRequestPacket));
 
     // register the gatekeeper for the packets it needs to receive
-    packetReceiver.registerListener(PacketType::DomainConnectRequest, &_gatekeeper, "processConnectRequestPacket");
-    packetReceiver.registerListener(PacketType::ICEPing, &_gatekeeper, "processICEPingPacket");
-    packetReceiver.registerListener(PacketType::ICEPingReply, &_gatekeeper, "processICEPingReplyPacket");
-    packetReceiver.registerListener(PacketType::ICEServerPeerInformation, &_gatekeeper, "processICEPeerInformationPacket");
+    packetReceiver.registerListener(PacketType::DomainConnectRequest,
+        PacketReceiver::makeUnsourcedListenerReference<DomainGatekeeper>(&_gatekeeper, &DomainGatekeeper::processConnectRequestPacket));
+    packetReceiver.registerListener(PacketType::ICEPing,
+        PacketReceiver::makeUnsourcedListenerReference<DomainGatekeeper>(&_gatekeeper, &DomainGatekeeper::processICEPingPacket));
+    packetReceiver.registerListener(PacketType::ICEPingReply,
+        PacketReceiver::makeUnsourcedListenerReference<DomainGatekeeper>(&_gatekeeper, &DomainGatekeeper::processICEPingReplyPacket));
+    packetReceiver.registerListener(PacketType::ICEServerPeerInformation,
+        PacketReceiver::makeUnsourcedListenerReference<DomainGatekeeper>(&_gatekeeper, &DomainGatekeeper::processICEPeerInformationPacket));
 
-    packetReceiver.registerListener(PacketType::ICEServerHeartbeatDenied, this, "processICEServerHeartbeatDenialPacket");
-    packetReceiver.registerListener(PacketType::ICEServerHeartbeatACK, this, "processICEServerHeartbeatACK");
+    packetReceiver.registerListener(PacketType::ICEServerHeartbeatDenied,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processICEServerHeartbeatDenialPacket));
+    packetReceiver.registerListener(PacketType::ICEServerHeartbeatACK,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processICEServerHeartbeatACK));
 
-    packetReceiver.registerListener(PacketType::OctreeDataFileRequest, this, "processOctreeDataRequestMessage");
-    packetReceiver.registerListener(PacketType::OctreeDataPersist, this, "processOctreeDataPersistMessage");
+    packetReceiver.registerListener(PacketType::OctreeDataFileRequest,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processOctreeDataRequestMessage));
+    packetReceiver.registerListener(PacketType::OctreeDataPersist,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::processOctreeDataPersistMessage));
 
-    packetReceiver.registerListener(PacketType::OctreeFileReplacement, this, "handleOctreeFileReplacementRequest");
-    packetReceiver.registerListener(PacketType::DomainContentReplacementFromUrl, this, "handleDomainContentReplacementFromURLRequest");
+    packetReceiver.registerListener(PacketType::OctreeFileReplacement,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::handleOctreeFileReplacementRequest));
+    packetReceiver.registerListener(PacketType::DomainContentReplacementFromUrl,
+        PacketReceiver::makeUnsourcedListenerReference<DomainServer>(this, &DomainServer::handleDomainContentReplacementFromURLRequest));
 
     // set a custom packetVersionMatch as the verify packet operator for the udt::Socket
     nodeList->setPacketFilterOperator(&DomainServer::isPacketVerified);
@@ -1156,7 +1176,7 @@ QUrl DomainServer::oauthAuthorizationURL(const QUuid& stateUUID) {
     QUrl authorizationURL = _oauthProviderURL;
 
     const QString OAUTH_AUTHORIZATION_PATH = "/oauth/authorize";
-    authorizationURL.setPath(OAUTH_AUTHORIZATION_PATH);
+    authorizationURL.setPath(MetaverseAPI::getCurrentMetaverseServerURLPath() + OAUTH_AUTHORIZATION_PATH);
 
     QUrlQuery authorizationQuery;
 
@@ -1434,7 +1454,7 @@ void DomainServer::sendPendingTransactionsToServer() {
         transactionCallbackParams.jsonCallbackMethod = "transactionJSONCallback";
 
         while (i != _pendingAssignmentCredits.end()) {
-            accountManager->sendRequest("api/v1/transactions",
+            accountManager->sendRequest("/api/v1/transactions",
                                        AccountManagerAuth::Required,
                                        QNetworkAccessManager::PostOperation,
                                        transactionCallbackParams, i.value()->postJson().toJson());
@@ -1620,7 +1640,7 @@ void DomainServer::sendICEServerAddressToMetaverseAPI() {
     callbackParameters.errorCallbackMethod = "handleFailedICEServerAddressUpdate";
     callbackParameters.jsonCallbackMethod = "handleSuccessfulICEServerAddressUpdate";
 
-    qCDebug(domain_server_ice) << "Updating ice-server address in High Fidelity Metaverse API to"
+    qCDebug(domain_server_ice) << "Updating ice-server address in Metaverse API to"
         << (_iceServerSocket.isNull() ? "" : _iceServerSocket.getAddress().toString());
 
     static const QString DOMAIN_ICE_ADDRESS_UPDATE = "/api/v1/domains/%1/ice_server_address";
@@ -1979,6 +1999,7 @@ const QString URI_OAUTH = "/oauth";
 bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {
     const QString JSON_MIME_TYPE = "application/json";
 
+    const QString URI_ID = "/id";
     const QString URI_ASSIGNMENT = "/assignment";
     const QString URI_NODES = "/nodes";
     const QString URI_SETTINGS = "/settings";
@@ -2055,7 +2076,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     }
 
     // check if this is a request for our domain ID
-    const QString URI_ID = "/id";
     if (connection->requestOperation() == QNetworkAccessManager::GetOperation
         && url.path() == URI_ID) {
         QUuid domainID = nodeList->getSessionUUID();
@@ -2562,7 +2582,7 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u
 
             const QString OAUTH_TOKEN_REQUEST_PATH = "/oauth/token";
             QUrl tokenRequestUrl = _oauthProviderURL;
-            tokenRequestUrl.setPath(OAUTH_TOKEN_REQUEST_PATH);
+            tokenRequestUrl.setPath(MetaverseAPI::getCurrentMetaverseServerURLPath() + OAUTH_TOKEN_REQUEST_PATH);
 
             const QString OAUTH_GRANT_TYPE_POST_STRING = "grant_type=authorization_code";
             QString tokenPostBody = OAUTH_GRANT_TYPE_POST_STRING;
@@ -2876,7 +2896,7 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR
 
     // fire off a request to get this user's identity so we can see if we will let them in
     QUrl profileURL = _oauthProviderURL;
-    profileURL.setPath("/api/v1/user/profile");
+    profileURL.setPath(MetaverseAPI::getCurrentMetaverseServerURLPath() + "/api/v1/user/profile");
     profileURL.setQuery(QString("%1=%2").arg(OAUTH_JSON_ACCESS_TOKEN_KEY, accessToken));
 
     qDebug() << "Sending profile request to: " << profileURL;
@@ -3725,7 +3745,7 @@ void DomainServer::screensharePresence(QString roomname, QUuid avatarID, int exp
     callbackData.insert("roomname", roomname);
     callbackData.insert("avatarID", avatarID.toString());
     callbackParams.callbackData = callbackData;
-    const QString PATH = "api/v1/domains/%1/screenshare";
+    const QString PATH = "/api/v1/domains/%1/screenshare";
     QString domain_id = uuidStringWithoutCurlyBraces(getID());
     QJsonObject json, screenshare;
     screenshare["username"] = verifiedUsername;

domain-server/src/DomainServer.h

@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 9/26/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

domain-server/src/DomainServerSettingsManager.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 2014-06-24.
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -1998,7 +1999,7 @@ void DomainServerSettingsManager::apiGetGroupID(const QString& groupName) {
     callbackParams.jsonCallbackMethod = "apiGetGroupIDJSONCallback";
     callbackParams.errorCallbackMethod = "apiGetGroupIDErrorCallback";
 
-    const QString GET_GROUP_ID_PATH = "api/v1/groups/names/%1";
+    const QString GET_GROUP_ID_PATH = "/api/v1/groups/names/%1";
     DependencyManager::get<AccountManager>()->sendRequest(GET_GROUP_ID_PATH.arg(groupName),
                                                           AccountManagerAuth::Required,
                                                           QNetworkAccessManager::GetOperation, callbackParams);
@@ -2064,7 +2065,7 @@ void DomainServerSettingsManager::apiGetGroupRanks(const QUuid& groupID) {
     callbackParams.jsonCallbackMethod = "apiGetGroupRanksJSONCallback";
     callbackParams.errorCallbackMethod = "apiGetGroupRanksErrorCallback";
 
-    const QString GET_GROUP_RANKS_PATH = "api/v1/groups/%1/ranks";
+    const QString GET_GROUP_RANKS_PATH = "/api/v1/groups/%1/ranks";
     DependencyManager::get<AccountManager>()->sendRequest(GET_GROUP_RANKS_PATH.arg(groupID.toString().mid(1,36)),
                                                           AccountManagerAuth::Required,
                                                           QNetworkAccessManager::GetOperation, callbackParams);

domain-server/src/DomainServerSettingsManager.h

@@ -4,6 +4,7 @@
 //
 //  Created by Stephen Birarda on 2014-06-24.
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -108,7 +109,7 @@ public:
     QStringList getDomainServerGroupNames();
     QStringList getDomainServerBlacklistGroupNames();
 
-    // these are used to locally cache the result of calling "api/v1/groups/.../is_member/..." on metaverse's api
+    // these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on metaverse's api
     void clearGroupMemberships(const QString& name) { _groupMembership[name.toLower()].clear(); }
     void recordGroupMembership(const QString& name, const QUuid groupID, QUuid rankID);
     QUuid isGroupMember(const QString& name, const QUuid& groupID); // returns rank or -1 if not a member
@@ -211,6 +212,8 @@ private:
 
     /// guard read/write access from multiple threads to settings 
     QReadWriteLock _settingsLock { QReadWriteLock::Recursive };
+
+    friend class DomainServer;
 };
 
 #endif // hifi_DomainServerSettingsManager_h

hifi_android.py

@@ -10,7 +10,7 @@ import zipfile
 
 print = functools.partial(print, flush=True)
 
-ANDROID_PACKAGE_URL = 'https://content.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
+ANDROID_PACKAGE_URL = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/'
 
 ANDROID_PACKAGES = {
     'qt' : {
@@ -68,7 +68,7 @@ ANDROID_PACKAGES = {
         'includeLibs': ['libtbb.so', 'libtbbmalloc.so'],
     },
     'hifiAC': {
-        'baseUrl': 'https://content.vircadia.com/eu-c-1/vircadia-public/dependencies/',
+        'baseUrl': 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/',
         'file': 'codecSDK-android_armv8-2.0.zip',
         'checksum': '1cbef929675818fc64c4101b72f84a6a'
     },

ice-server/src/IceServer.cpp

@@ -211,8 +211,15 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) {
     auto& networkAccessManager = NetworkAccessManager::getInstance();
 
     QUrl publicKeyURL{ MetaverseAPI::getCurrentMetaverseServerURL() };
+    // qDebug() << "publicKeyURL" << publicKeyURL;
+    // qDebug() << "MetaverseAPI::getCurrentMetaverseServerURLPath()" << MetaverseAPI::getCurrentMetaverseServerURLPath();
     QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID));
-    publicKeyURL.setPath(publicKeyPath);
+    publicKeyURL.setPath("/" + MetaverseAPI::getCurrentMetaverseServerURLPath() + publicKeyPath);
+    // qDebug() << "publicKeyPath" << publicKeyPath;
+    // qDebug() << "publicKeyURL.setPath" << "/" + MetaverseAPI::getCurrentMetaverseServerURLPath() + publicKeyPath;
+    // qDebug() << "publicKeyURL" << publicKeyURL;
+    // qDebug() << "publicKeyURL.isValid()" << publicKeyURL.isValid();
+    // qDebug() << "publicKeyURL.errorString()" << publicKeyURL.errorString();
 
     QNetworkRequest publicKeyRequest { publicKeyURL };
     publicKeyRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);

interface/CMakeLists.txt

@@ -238,6 +238,8 @@ target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries
 target_openssl()
 
 target_bullet()
+
+set(OpenGL_GL_PREFERENCE "LEGACY")
 target_opengl()
 add_crashpad()
 target_breakpad()

interface/resources/avatar/bookmarks/avatarbookmarks.json

@@ -1,861 +1,71 @@
 {
-    "Anime boy": {
-        "attachments": [
-        ],
-        "avatarEntites": [
-            {
-                "properties": {
-                    "acceleration": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "actionData": "",
-                    "age": 6.915350914001465,
-                    "ageAsText": "0 hours 0 minutes 6 seconds",
-                    "angularDamping": 0.39346998929977417,
-                    "angularVelocity": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "animation": {
-                        "allowTranslation": true,
-                        "currentFrame": 0,
-                        "firstFrame": 0,
-                        "fps": 30,
-                        "hold": false,
-                        "lastFrame": 100000,
-                        "loop": true,
-                        "running": false,
-                        "url": ""
-                    },
-                    "boundingBox": {
-                        "brn": {
-                            "x": -0.10961885005235672,
-                            "y": -0.19444090127944946,
-                            "z": -0.15760529041290283
-                        },
-                        "center": {
-                            "x": 2.6226043701171875e-06,
-                            "y": -0.13999652862548828,
-                            "z": -0.04999971389770508
-                        },
-                        "dimensions": {
-                            "x": 0.21924294531345367,
-                            "y": 0.10888873785734177,
-                            "z": 0.2152111530303955
-                        },
-                        "tfl": {
-                            "x": 0.10962409526109695,
-                            "y": -0.0855521634221077,
-                            "z": 0.057605862617492676
-                        }
-                    },
-                    "canCastShadow": true,
-                    "certificateID": "",
-                    "clientOnly": true,
-                    "cloneAvatarEntity": false,
-                    "cloneDynamic": false,
-                    "cloneLifetime": 300,
-                    "cloneLimit": 0,
-                    "cloneOriginID": "{00000000-0000-0000-0000-000000000000}",
-                    "cloneable": false,
-                    "collidesWith": "",
-                    "collisionMask": 0,
-                    "collisionSoundURL": "",
-                    "collisionless": false,
-                    "collisionsWillMove": false,
-                    "compoundShapeURL": "",
-                    "created": "2018-06-06T17:27:53Z",
-                    "damping": 0.39346998929977417,
-                    "density": 1000,
-                    "description": "",
-                    "dimensions": {
-                        "x": 0.21924294531345367,
-                        "y": 0.07768379896879196,
-                        "z": 0.2055898904800415
-                    },
-                    "dynamic": false,
-                    "editionNumber": 15,
-                    "entityInstanceNumber": 0,
-                    "friction": 0.5,
-                    "gravity": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "href": "",
-                    "id": "{5d20c775-a0d7-4163-b158-4e0a784a4625}",
-                    "ignoreForCollisions": false,
-                    "itemArtist": "jyoum",
-                    "itemCategories": "Wearables",
-                    "itemDescription": "Wear these, and others will respect your authoritah.",
-                    "itemLicense": "",
-                    "itemName": "Aviators",
-                    "jointRotations": [
-                    ],
-                    "jointRotationsSet": [
-                    ],
-                    "jointTranslations": [
-                    ],
-                    "jointTranslationsSet": [
-                    ],
-                    "lastEdited": 1528306178314655,
-                    "lastEditedBy": "{439a2669-4626-487f-9dcf-2d15e77c69a2}",
-                    "lifetime": -1,
-                    "limitedRun": 4294967295,
-                    "localPosition": {
-                        "x": 2.6226043701171875e-06,
-                        "y": -0.13999652862548828,
-                        "z": -0.04999971389770508
-                    },
-                    "localRotation": {
-                        "w": 0.9969173073768616,
-                        "x": -0.07845909893512726,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "locked": false,
-                    "marketplaceID": "40d879ec-93f0-4b4a-8c58-dd6349bdb058",
-                    "modelURL": "http://mpassets.highfidelity.com/40d879ec-93f0-4b4a-8c58-dd6349bdb058-v1/Aviator.fbx",
-                    "name": "",
-                    "naturalDimensions": {
-                        "x": 0.1660931408405304,
-                        "y": 0.05885136127471924,
-                        "z": 0.15574991703033447
-                    },
-                    "naturalPosition": {
-                        "x": 0,
-                        "y": 1.6633577346801758,
-                        "z": 0.048884183168411255
-                    },
-                    "originalTextures": "{\n    \"aviator:Eyewear2F\": \"http://mpassets.highfidelity.com/40d879ec-93f0-4b4a-8c58-dd6349bdb058-v1/Aviator.fbx/Aviator.fbm/aviator_Eyewear_Diffuse.png\",\n    \"aviator:Eyewear2F1\": \"http://mpassets.highfidelity.com/40d879ec-93f0-4b4a-8c58-dd6349bdb058-v1/Aviator.fbx/Aviator.fbm/aviator_Eyewear_Specular.png\"\n}\n",
-                    "owningAvatarID": "{439a2669-4626-487f-9dcf-2d15e77c69a2}",
-                    "parentID": "{439a2669-4626-487f-9dcf-2d15e77c69a2}",
-                    "parentJointIndex": 66,
-                    "position": {
-                        "x": 2.6226043701171875e-06,
-                        "y": -0.13999652862548828,
-                        "z": -0.04999971389770508
-                    },
-                    "queryAACube": {
-                        "scale": 0.9313028454780579,
-                        "x": -1.4091639518737793,
-                        "y": -10.133878707885742,
-                        "z": 1.9983724355697632
-                    },
-                    "registrationPoint": {
-                        "x": 0.5,
-                        "y": 0.5,
-                        "z": 0.5
-                    },
-                    "relayParentJoints": false,
-                    "renderInfo": {
-                        "drawCalls": 1,
-                        "hasTransparent": false,
-                        "texturesCount": 2,
-                        "texturesSize": 1310720,
-                        "verticesCount": 982
-                    },
-                    "restitution": 0.5,
-                    "rotation": {
-                        "w": 0.9969173073768616,
-                        "x": -0.07845909893512726,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "script": "",
-                    "scriptTimestamp": 0,
-                    "serverScripts": "",
-                    "shapeType": "box",
-                    "staticCertificateVersion": 0,
-                    "textures": "",
-                    "type": "Model",
-                    "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"HeadTop_End\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}",
-                    "velocity": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "visible": true
-                }
-            }
-        ],
-        "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/46e0fd52-3cff-462f-ba97-927338d88295-v1/AnimeBoy2.fst",
-        "version": 3
-    },
-    "Anime girl": {
-        "attachments": [
-        ],
-        "avatarEntites": [
-            {
-                "properties": {
-                    "acceleration": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "actionData": "",
-                    "age": 19.66267967224121,
-                    "ageAsText": "0 hours 0 minutes 19 seconds",
-                    "angularDamping": 0.39346998929977417,
-                    "angularVelocity": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "animation": {
-                        "allowTranslation": true,
-                        "currentFrame": 0,
-                        "firstFrame": 0,
-                        "fps": 30,
-                        "hold": false,
-                        "lastFrame": 100000,
-                        "loop": true,
-                        "running": false,
-                        "url": ""
-                    },
-                    "boundingBox": {
-                        "brn": {
-                            "x": -0.10536206513643265,
-                            "y": -0.16647332906723022,
-                            "z": -0.12632352113723755
-                        },
-                        "center": {
-                            "x": 0,
-                            "y": -0.12999999523162842,
-                            "z": -0.030000001192092896
-                        },
-                        "dimensions": {
-                            "x": 0.2107241302728653,
-                            "y": 0.07294666767120361,
-                            "z": 0.1926470398902893
-                        },
-                        "tfl": {
-                            "x": 0.10536206513643265,
-                            "y": -0.09352666139602661,
-                            "z": 0.06632351875305176
-                        }
-                    },
-                    "canCastShadow": true,
-                    "certificateID": "",
-                    "clientOnly": true,
-                    "cloneAvatarEntity": false,
-                    "cloneDynamic": false,
-                    "cloneLifetime": 300,
-                    "cloneLimit": 0,
-                    "cloneOriginID": "{00000000-0000-0000-0000-000000000000}",
-                    "cloneable": false,
-                    "collidesWith": "",
-                    "collisionMask": 0,
-                    "collisionSoundURL": "",
-                    "collisionless": false,
-                    "collisionsWillMove": false,
-                    "compoundShapeURL": "",
-                    "created": "2018-06-05T00:10:37Z",
-                    "damping": 0.39346998929977417,
-                    "density": 1000,
-                    "description": "",
-                    "dimensions": {
-                        "x": 0.2107241302728653,
-                        "y": 0.07294666767120361,
-                        "z": 0.1926470398902893
-                    },
-                    "dynamic": false,
-                    "editionNumber": 5,
-                    "entityInstanceNumber": 0,
-                    "friction": 0.5,
-                    "gravity": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "href": "",
-                    "id": "{1586b83a-2af7-4532-9bfb-82fe3f5d5ce9}",
-                    "ignoreForCollisions": false,
-                    "itemArtist": "moam_00",
-                    "itemCategories": "Wearables",
-                    "itemDescription": "Perfect for side-glancin'.",
-                    "itemLicense": "",
-                    "itemName": "Blacker Fem Glasses",
-                    "jointRotations": [
-                    ],
-                    "jointRotationsSet": [
-                    ],
-                    "jointTranslations": [
-                    ],
-                    "jointTranslationsSet": [
-                    ],
-                    "lastEdited": 1528157470041658,
-                    "lastEditedBy": "{425df1a8-289b-42fc-819c-c3b2a12d7165}",
-                    "lifetime": -1,
-                    "limitedRun": 4294967295,
-                    "localPosition": {
-                        "x": 0,
-                        "y": -0.12999999523162842,
-                        "z": -0.029999999329447746
-                    },
-                    "localRotation": {
-                        "w": 1,
-                        "x": -2.2351741790771484e-08,
-                        "y": 3.4924596548080444e-10,
-                        "z": 3.725290298461914e-09
-                    },
-                    "locked": false,
-                    "marketplaceID": "06781d12-9139-48f4-ac2a-417dde090981",
-                    "modelURL": "http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx",
-                    "name": "Female Glasses 3 by Mario Andrade",
-                    "naturalDimensions": {
-                        "x": 0.16209548711776733,
-                        "y": 0.05611282214522362,
-                        "z": 0.14819003641605377
-                    },
-                    "naturalPosition": {
-                        "x": 0,
-                        "y": -7.636845111846924e-08,
-                        "z": 0
-                    },
-                    "originalTextures": "{\n    \"file49\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Mixed_AO.jpg\",\n    \"file81\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Metallic.jpg\",\n    \"file84\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Roughness.jpg\",\n    \"file86\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Base_Color.jpg\",\n    \"file87\": \"http://mpassets.highfidelity.com/06781d12-9139-48f4-ac2a-417dde090981-v1/FemGlasses03.fbx/FemGlasses03.fbm/FemGlasses03Mat_Normal_DirectX.jpg\"\n}\n",
-                    "owningAvatarID": "{1277f725-fbb4-478b-ae79-1241fd90e508}",
-                    "parentID": "{1277f725-fbb4-478b-ae79-1241fd90e508}",
-                    "parentJointIndex": 66,
-                    "position": {
-                        "x": 0,
-                        "y": -0.12999999523162842,
-                        "z": -0.029999999329447746
-                    },
-                    "queryAACube": {
-                        "scale": 0.8840523958206177,
-                        "x": -2.6587564945220947,
-                        "y": -10.162277221679688,
-                        "z": -0.9548344016075134
-                    },
-                    "registrationPoint": {
-                        "x": 0.5,
-                        "y": 0.5,
-                        "z": 0.5
-                    },
-                    "relayParentJoints": false,
-                    "renderInfo": {
-                        "drawCalls": 1,
-                        "hasTransparent": false,
-                        "texturesCount": 5,
-                        "texturesSize": 0,
-                        "verticesCount": 1156
-                    },
-                    "restitution": 0.5,
-                    "rotation": {
-                        "w": 1,
-                        "x": -2.2351741790771484e-08,
-                        "y": 3.4924596548080444e-10,
-                        "z": 3.725290298461914e-09
-                    },
-                    "script": "",
-                    "scriptTimestamp": 0,
-                    "serverScripts": "",
-                    "shapeType": "box",
-                    "staticCertificateVersion": 0,
-                    "textures": "",
-                    "type": "Model",
-                    "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"HeadTop_End\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}",
-                    "velocity": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "visible": true
-                }
-            }
-        ],
-        "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/0dce3426-55c8-4641-8dd5-d76eb575b64a-v1/Anime_F_Outfit.fst",
-        "version": 3
-    },
-    "Last Legends: Male": {
-        "attachments": [
-        ],
-        "avatarEntites": [
-            {
-                "properties": {
-                    "acceleration": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "actionData": "",
-                    "age": 321.8835144042969,
-                    "ageAsText": "0 hours 5 minutes 21 seconds",
-                    "angularDamping": 0.39346998929977417,
-                    "angularVelocity": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "animation": {
-                        "allowTranslation": true,
-                        "currentFrame": 0,
-                        "firstFrame": 0,
-                        "fps": 30,
-                        "hold": false,
-                        "lastFrame": 100000,
-                        "loop": true,
-                        "running": false,
-                        "url": ""
-                    },
-                    "boundingBox": {
-                        "brn": {
-                            "blue": -0.03950843587517738,
-                            "green": 0.20785385370254517,
-                            "red": -0.04381325840950012,
-                            "x": -0.04381325840950012,
-                            "y": 0.20785385370254517,
-                            "z": -0.03950843587517738
-                        },
-                        "center": {
-                            "blue": 0,
-                            "green": 0.23000000417232513,
-                            "red": 0,
-                            "x": 0,
-                            "y": 0.23000000417232513,
-                            "z": 0
-                        },
-                        "dimensions": {
-                            "blue": 0.07901687175035477,
-                            "green": 0.044292300939559937,
-                            "red": 0.08762651681900024,
-                            "x": 0.08762651681900024,
-                            "y": 0.044292300939559937,
-                            "z": 0.07901687175035477
-                        },
-                        "tfl": {
-                            "blue": 0.03950843587517738,
-                            "green": 0.2521461546421051,
-                            "red": 0.04381325840950012,
-                            "x": 0.04381325840950012,
-                            "y": 0.2521461546421051,
-                            "z": 0.03950843587517738
-                        }
-                    },
-                    "canCastShadow": true,
-                    "certificateID": "",
-                    "clientOnly": true,
-                    "cloneAvatarEntity": false,
-                    "cloneDynamic": false,
-                    "cloneLifetime": 300,
-                    "cloneLimit": 0,
-                    "cloneOriginID": "{00000000-0000-0000-0000-000000000000}",
-                    "cloneable": false,
-                    "collidesWith": "",
-                    "collisionMask": 0,
-                    "collisionSoundURL": "",
-                    "collisionless": false,
-                    "collisionsWillMove": false,
-                    "compoundShapeURL": "",
-                    "created": "2018-07-26T23:56:46Z",
-                    "damping": 0.39346998929977417,
-                    "density": 1000,
-                    "description": "",
-                    "dimensions": {
-                        "blue": 0.07229919731616974,
-                        "green": 0.06644226610660553,
-                        "red": 0.03022606298327446,
-                        "x": 0.03022606298327446,
-                        "y": 0.06644226610660553,
-                        "z": 0.07229919731616974
-                    },
-                    "dynamic": false,
-                    "editionNumber": 58,
-                    "entityInstanceNumber": 0,
-                    "friction": 0.5,
-                    "gravity": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "href": "",
-                    "id": "{03053239-bb37-4c51-a013-a1772baaeed5}",
-                    "ignoreForCollisions": false,
-                    "itemArtist": "jyoum",
-                    "itemCategories": "Wearables",
-                    "itemDescription": "A cool scifi watch for your avatar!",
-                    "itemLicense": "",
-                    "itemName": "Scifi Watch",
-                    "jointRotations": [
-                    ],
-                    "jointRotationsSet": [
-                    ],
-                    "jointTranslations": [
-                    ],
-                    "jointTranslationsSet": [
-                    ],
-                    "lastEdited": 1532649569894305,
-                    "lastEditedBy": "{042ac463-7879-40f0-8126-e2e56c4345ca}",
-                    "lifetime": -1,
-                    "limitedRun": 4294967295,
-                    "localPosition": {
-                        "blue": 0,
-                        "green": 0.23000000417232513,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0.23000000417232513,
-                        "z": 0
-                    },
-                    "localRotation": {
-                        "w": 0.5910986065864563,
-                        "x": -0.48726415634155273,
-                        "y": -0.4088630974292755,
-                        "z": 0.49599072337150574
-                    },
-                    "locked": false,
-                    "marketplaceID": "0685794d-fddb-4bad-a608-6d7789ceda90",
-                    "modelURL": "http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx",
-                    "name": "Scifi Watch by Jimi",
-                    "naturalDimensions": {
-                        "blue": 0.055614765733480453,
-                        "green": 0.0511094331741333,
-                        "red": 0.023250818252563477,
-                        "x": 0.023250818252563477,
-                        "y": 0.0511094331741333,
-                        "z": 0.055614765733480453
-                    },
-                    "naturalPosition": {
-                        "blue": -0.06031447649002075,
-                        "green": 1.4500460624694824,
-                        "red": 0.6493338942527771,
-                        "x": 0.6493338942527771,
-                        "y": 1.4500460624694824,
-                        "z": -0.06031447649002075
-                    },
-                    "originalTextures": "{\n    \"file4\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Base_Color.png\",\n    \"file5\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Normal_OpenGL.png\",\n    \"file6\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Metallic.png\",\n    \"file7\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Roughness.png\",\n    \"file8\": \"http://mpassets.highfidelity.com/0685794d-fddb-4bad-a608-6d7789ceda90-v1/ScifiWatch.fbx/ScifiWatch/texture/lambert1_Emissive.png\"\n}\n",
-                    "owningAvatarID": "{042ac463-7879-40f0-8126-e2e56c4345ca}",
-                    "parentID": "{042ac463-7879-40f0-8126-e2e56c4345ca}",
-                    "parentJointIndex": 16,
-                    "position": {
-                        "blue": 0,
-                        "green": 0.23000000417232513,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0.23000000417232513,
-                        "z": 0
-                    },
-                    "queryAACube": {
-                        "scale": 0.3082179129123688,
-                        "x": 495.7716979980469,
-                        "y": 498.345703125,
-                        "z": 498.52044677734375
-                    },
-                    "registrationPoint": {
-                        "blue": 0.5,
-                        "green": 0.5,
-                        "red": 0.5,
-                        "x": 0.5,
-                        "y": 0.5,
-                        "z": 0.5
-                    },
-                    "relayParentJoints": false,
-                    "renderInfo": {
-                        "drawCalls": 1,
-                        "hasTransparent": false,
-                        "texturesCount": 5,
-                        "texturesSize": 786432,
-                        "verticesCount": 273
-                    },
-                    "restitution": 0.5,
-                    "rotation": {
-                        "w": 0.5910986065864563,
-                        "x": -0.48726415634155273,
-                        "y": -0.4088630974292755,
-                        "z": 0.49599072337150574
-                    },
-                    "script": "",
-                    "scriptTimestamp": 0,
-                    "serverScripts": "",
-                    "shapeType": "box",
-                    "staticCertificateVersion": 0,
-                    "textures": "",
-                    "type": "Model",
-                    "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"[LR]ForeArm\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}",
-                    "velocity": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "visible": true
-                }
-            },
-            {
-                "properties": {
-                    "acceleration": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "actionData": "",
-                    "age": 308.8044128417969,
-                    "ageAsText": "0 hours 5 minutes 8 seconds",
-                    "angularDamping": 0.39346998929977417,
-                    "angularVelocity": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "animation": {
-                        "allowTranslation": true,
-                        "currentFrame": 0,
-                        "firstFrame": 0,
-                        "fps": 30,
-                        "hold": false,
-                        "lastFrame": 100000,
-                        "loop": true,
-                        "running": false,
-                        "url": ""
-                    },
-                    "boundingBox": {
-                        "brn": {
-                            "blue": -0.2340194433927536,
-                            "green": -0.07067721337080002,
-                            "red": -0.17002610862255096,
-                            "x": -0.17002610862255096,
-                            "y": -0.07067721337080002,
-                            "z": -0.2340194433927536
-                        },
-                        "center": {
-                            "blue": -0.039825439453125,
-                            "green": 0.02001953125,
-                            "red": 0.0001678466796875,
-                            "x": 0.0001678466796875,
-                            "y": 0.02001953125,
-                            "z": -0.039825439453125
-                        },
-                        "dimensions": {
-                            "blue": 0.3883880078792572,
-                            "green": 0.18139348924160004,
-                            "red": 0.34038791060447693,
-                            "x": 0.34038791060447693,
-                            "y": 0.18139348924160004,
-                            "z": 0.3883880078792572
-                        },
-                        "tfl": {
-                            "blue": 0.1543685644865036,
-                            "green": 0.11071627587080002,
-                            "red": 0.17036180198192596,
-                            "x": 0.17036180198192596,
-                            "y": 0.11071627587080002,
-                            "z": 0.1543685644865036
-                        }
-                    },
-                    "canCastShadow": true,
-                    "certificateID": "",
-                    "clientOnly": true,
-                    "cloneAvatarEntity": false,
-                    "cloneDynamic": false,
-                    "cloneLifetime": 300,
-                    "cloneLimit": 0,
-                    "cloneOriginID": "{00000000-0000-0000-0000-000000000000}",
-                    "cloneable": false,
-                    "collidesWith": "",
-                    "collisionMask": 0,
-                    "collisionSoundURL": "",
-                    "collisionless": false,
-                    "collisionsWillMove": false,
-                    "compoundShapeURL": "",
-                    "created": "2018-07-26T23:56:46Z",
-                    "damping": 0.39346998929977417,
-                    "density": 1000,
-                    "description": "",
-                    "dimensions": {
-                        "blue": 0.38838762044906616,
-                        "green": 0.16981728374958038,
-                        "red": 0.33466479182243347,
-                        "x": 0.33466479182243347,
-                        "y": 0.16981728374958038,
-                        "z": 0.38838762044906616
-                    },
-                    "dynamic": false,
-                    "editionNumber": 18,
-                    "entityInstanceNumber": 0,
-                    "friction": 0.5,
-                    "gravity": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "href": "",
-                    "id": "{1bf231ce-3913-4c53-be3c-b1f4094dac51}",
-                    "ignoreForCollisions": false,
-                    "itemArtist": "jyoum",
-                    "itemCategories": "Wearables",
-                    "itemDescription": "A stylish and classic piece of headwear for your avatar.",
-                    "itemLicense": "",
-                    "itemName": "Fedora",
-                    "jointRotations": [
-                    ],
-                    "jointRotationsSet": [
-                    ],
-                    "jointTranslations": [
-                    ],
-                    "jointTranslationsSet": [
-                    ],
-                    "lastEdited": 1532649698129709,
-                    "lastEditedBy": "{042ac463-7879-40f0-8126-e2e56c4345ca}",
-                    "lifetime": -1,
-                    "limitedRun": 4294967295,
-                    "localPosition": {
-                        "blue": -0.039825439453125,
-                        "green": 0.02001953125,
-                        "red": 0.0001678466796875,
-                        "x": 0.0001678466796875,
-                        "y": 0.02001953125,
-                        "z": -0.039825439453125
-                    },
-                    "localRotation": {
-                        "w": 0.9998477101325989,
-                        "x": -9.898545982878204e-09,
-                        "y": 5.670873406415922e-07,
-                        "z": 0.017452405765652657
-                    },
-                    "locked": false,
-                    "marketplaceID": "11c4208d-15d7-4449-9758-a08da6dbd3dc",
-                    "modelURL": "http://mpassets.highfidelity.com/11c4208d-15d7-4449-9758-a08da6dbd3dc-v1/Fedora.fbx",
-                    "name": "",
-                    "naturalDimensions": {
-                        "blue": 0.320981502532959,
-                        "green": 0.14034485816955566,
-                        "red": 0.2765824794769287,
-                        "x": 0.2765824794769287,
-                        "y": 0.14034485816955566,
-                        "z": 0.320981502532959
-                    },
-                    "naturalPosition": {
-                        "blue": 0.022502630949020386,
-                        "green": 1.7460365295410156,
-                        "red": 0.000143393874168396,
-                        "x": 0.000143393874168396,
-                        "y": 1.7460365295410156,
-                        "z": 0.022502630949020386
-                    },
-                    "originalTextures": "{\n    \"file5\": \"http://mpassets.highfidelity.com/11c4208d-15d7-4449-9758-a08da6dbd3dc-v1/Fedora.fbx/Texture/Fedora_Hat1_Base_Color.png\",\n    \"file7\": \"http://mpassets.highfidelity.com/11c4208d-15d7-4449-9758-a08da6dbd3dc-v1/Fedora.fbx/Texture/Fedora_Hat1_Roughness.png\"\n}\n",
-                    "owningAvatarID": "{042ac463-7879-40f0-8126-e2e56c4345ca}",
-                    "parentID": "{042ac463-7879-40f0-8126-e2e56c4345ca}",
-                    "parentJointIndex": 66,
-                    "position": {
-                        "blue": -0.039825439453125,
-                        "green": 0.02001953125,
-                        "red": 0.0001678466796875,
-                        "x": 0.0001678466796875,
-                        "y": 0.02001953125,
-                        "z": -0.039825439453125
-                    },
-                    "queryAACube": {
-                        "scale": 1.6202316284179688,
-                        "x": 495.21051025390625,
-                        "y": 498.5577697753906,
-                        "z": 497.6370849609375
-                    },
-                    "registrationPoint": {
-                        "blue": 0.5,
-                        "green": 0.5,
-                        "red": 0.5,
-                        "x": 0.5,
-                        "y": 0.5,
-                        "z": 0.5
-                    },
-                    "relayParentJoints": false,
-                    "renderInfo": {
-                        "drawCalls": 1,
-                        "hasTransparent": false,
-                        "texturesCount": 2,
-                        "texturesSize": 327680,
-                        "verticesCount": 719
-                    },
-                    "restitution": 0.5,
-                    "rotation": {
-                        "w": 0.9998477101325989,
-                        "x": -9.898545982878204e-09,
-                        "y": 5.670873406415922e-07,
-                        "z": 0.017452405765652657
-                    },
-                    "script": "",
-                    "scriptTimestamp": 0,
-                    "serverScripts": "",
-                    "shapeType": "box",
-                    "staticCertificateVersion": 0,
-                    "textures": "",
-                    "type": "Model",
-                    "userData": "{\"Attachment\":{\"action\":\"attach\",\"joint\":\"HeadTop_End\",\"attached\":false,\"options\":{\"translation\":{\"x\":0,\"y\":0,\"z\":0},\"scale\":1}},\"grabbableKey\":{\"cloneable\":false,\"grabbable\":true}}",
-                    "velocity": {
-                        "blue": 0,
-                        "green": 0,
-                        "red": 0,
-                        "x": 0,
-                        "y": 0,
-                        "z": 0
-                    },
-                    "visible": true
-                }
-            }
-        ],
-        "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/28569047-6f1a-4100-af67-8054ec397cc3-v1/LLMale2.fst",
-        "version": 3
-    },
-    "Last legends Female": {
-        "attachments": [
-        ],
-        "avatarEntites": [
-        ],
-        "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/8d823be5-6197-4418-b984-eb94160ed956-v1/LLFemale_Clothes.fst",
-        "version": 3
-    },
-    "Matthew": {
-        "attachments": [
-        ],
-        "avatarEntites": [
-        ],
-        "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/b652081b-a199-425e-ae5c-7815721bdc09-v1/matthew.fst",
-        "version": 3
-    },
-    "Priscilla": {
-        "attachments": [
-        ],
-        "avatarEntites": [
-        ],
-        "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/e7565f93-8bc5-47c2-b6eb-b3b31d4a1339-v1/priscilla.fst",
-        "version": 3
-    },
     "Woody": {
         "attachments": [
         ],
         "avatarEntites": [
         ],
         "avatarScale": 1,
-        "avatarUrl": "http://mpassets.highfidelity.com/ad348528-de38-420c-82bb-054cb22163f5-v1/mannequin.fst",
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Woody/mannequin.fst",
+        "version": 3
+    },
+    "Kim": {
+        "attachments": [
+        ],
+        "avatarEntites": [
+        ],
+        "avatarScale": 1,
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Kim/fbx/Kim.fst",
+        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Kim/img/icon.png",
+        "version": 3
+    },
+    "Mason": {
+        "attachments": [
+        ],
+        "avatarEntites": [
+        ],
+        "avatarScale": 1,
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mason/fbx/Mason.fst",
+        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mason/img/icon.png",
+        "version": 3
+    },
+    "Mike": {
+        "attachments": [
+        ],
+        "avatarEntites": [
+        ],
+        "avatarScale": 1,
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mike/fbx/Mike.fst",
+        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Mike/img/icon.png",
+        "version": 3
+    },
+    "Sean": {
+        "attachments": [
+        ],
+        "avatarEntites": [
+        ],
+        "avatarScale": 1,
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Sean/fbx/Sean.fst",
+        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Sean/img/icon.png",
+        "version": 3
+    },
+    "Summer": {
+        "attachments": [
+        ],
+        "avatarEntites": [
+        ],
+        "avatarScale": 1,
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Summer/fbx/Summer.fst",
+        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Summer/img/icon.png",
+        "version": 3
+    },
+    "Tanya": {
+        "attachments": [
+        ],
+        "avatarEntites": [
+        ],
+        "avatarScale": 1,
+        "avatarUrl": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Tanya/fbx/Tanya.fst",
+        "avatarIcon": "https://cdn-1.vircadia.com/us-e-1/Bazaar/Avatars/Tanya/img/icon.png",
         "version": 3
     }
-}
+}

interface/resources/controllers/keyboardMouse.json

@@ -3,9 +3,9 @@
     "channels": [
         { "from": "Keyboard.A", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.D", "when": ["Keyboard.RightMouseButton", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
-        { "from": "Keyboard.E", "when": ["!Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
-        { "from": "Keyboard.Q", "when": ["!Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
+        { "from": "Keyboard.Q", "when": ["!Application.CameraSelfie", "!Keyboard.Control", "!Application.CaptureMouse"], "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.Q", "when": ["Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_RIGHT" },
+        { "from": "Keyboard.E", "when": ["!Application.CameraSelfie", "!Keyboard.Control", "!Application.CaptureMouse"], "to": "Actions.LATERAL_RIGHT" },
         { "from": "Keyboard.E", "when": ["Application.CameraSelfie", "!Keyboard.Control"], "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.T", "when": "!Keyboard.Control", "to": "Actions.TogglePushToTalk" },
 
@@ -72,46 +72,20 @@
         { "from": { "makeAxis" : [
                 ["Keyboard.Left"],
                 ["Keyboard.Right"]
-             ]
+            ]
           },
-          "when": ["Application.CameraFirstPerson", "!Keyboard.Shift"],
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity", "!Application.CaptureMouse", "!Keyboard.Shift"],
           "to": "Actions.Yaw"
         },
 
-        { "from": { "makeAxis" : [
-                ["Keyboard.Left"],
-                ["Keyboard.Right"]
-             ]
-          },
-          "when": ["Application.CameraFirstPersonLookat", "!Keyboard.Shift"],
-          "to": "Actions.Yaw"
+        { "from": "Keyboard.Left",
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity", "Application.CaptureMouse", "!Keyboard.Shift"],
+          "to": "Actions.LATERAL_LEFT"
         },
 
-        { "from": { "makeAxis" : [
-                ["Keyboard.Left"],
-                ["Keyboard.Right"]
-             ]
-          },
-          "when": ["Application.CameraThirdPerson", "!Keyboard.Shift"],
-          "to": "Actions.Yaw"
-        },
-        
-        { "from": { "makeAxis" : [
-                ["Keyboard.Left"],
-                ["Keyboard.Right"]
-             ]
-          },
-          "when": ["Application.CameraLookAt", "!Keyboard.Shift"],
-          "to": "Actions.Yaw"
-        },
-
-        { "from": { "makeAxis" : [
-                ["Keyboard.Left"],
-                ["Keyboard.Right"]
-             ]
-          },
-          "when": ["Application.CameraSelfie", "!Keyboard.Shift"],
-          "to": "Actions.Yaw"
+        { "from": "Keyboard.Right",
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity", "Application.CaptureMouse", "!Keyboard.Shift"],
+          "to": "Actions.LATERAL_RIGHT"
         },
 
         { "from": { "makeAxis" : [
@@ -119,53 +93,18 @@
                 ["Keyboard.D"]
             ]
           },
-          "when": ["Application.CameraFirstPerson", "!Keyboard.Control"],
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity", "!Application.CaptureMouse", "!Keyboard.Control"],
           "to": "Actions.Yaw"
         },
 
-        { "from": { "makeAxis" : [
-                ["Keyboard.A"],
-                ["Keyboard.D"]
-            ]
-          },
-          "when": ["Application.CameraFirstPersonLookat", "!Keyboard.Control"],
-          "to": "Actions.Yaw"
+        { "from": "Keyboard.A",
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity", "Application.CaptureMouse", "!Keyboard.Control"],
+          "to": "Actions.LATERAL_LEFT"
         },
 
-        { "from": { "makeAxis" : [
-                ["Keyboard.A"],
-                ["Keyboard.D"]
-            ]
-          },
-          "when": ["Application.CameraThirdPerson", "!Keyboard.Control"],
-          "to": "Actions.Yaw"
-        },
-        
-        { "from": { "makeAxis" : [
-                ["Keyboard.A"],
-                ["Keyboard.D"]
-             ]
-          },
-          "when": ["Application.CameraLookAt", "!Keyboard.Control"],
-          "to": "Actions.Yaw"
-        },
-
-        { "from": { "makeAxis" : [
-                ["Keyboard.A"],
-                ["Keyboard.D"]
-             ]
-          },
-          "when": ["Application.CameraSelfie", "!Keyboard.Control"],
-          "to": "Actions.Yaw"
-        },
-        
-        { "from": { "makeAxis" : [
-                ["Keyboard.TouchpadLeft"],
-                ["Keyboard.TouchpadRight"]
-            ]
-          },
-          "when": "Application.CameraFirstPerson",
-          "to": "Actions.Yaw"
+        { "from": "Keyboard.D",
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity", "Application.CaptureMouse", "!Keyboard.Control"],
+          "to": "Actions.LATERAL_RIGHT"
         },
 
         { "from": { "makeAxis" : [
@@ -173,39 +112,12 @@
                 ["Keyboard.TouchpadRight"]
             ]
           },
-          "when": "Application.CameraFirstPersonLookat",
-          "to": "Actions.Yaw"
-        },
-        
-        { "from": { "makeAxis" : [
-                ["Keyboard.TouchpadLeft"],
-                ["Keyboard.TouchpadRight"]
-            ]
-          },
-          "when": "Application.CameraThirdPerson",
-          "to": "Actions.Yaw"
-        },
-        
-        { "from": { "makeAxis" : [
-                ["Keyboard.TouchpadLeft"],
-                ["Keyboard.TouchpadRight"]
-            ]
-          },
-          "when": "Application.CameraLookAt",
-          "to": "Actions.Yaw"
-        },
-        
-        { "from": { "makeAxis" : [
-                ["Keyboard.TouchpadLeft"],
-                ["Keyboard.TouchpadRight"]
-            ]
-          },
-          "when": "Application.CameraSelfie",
+          "when": ["!Application.CameraFSM", "!Application.CameraIndependent", "!Application.CameraEntity"],
           "to": "Actions.Yaw"
         },
 
         { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
-          "when": "Keyboard.RightMouseButton",
+          "when": ["Keyboard.RightMouseButton", "!Application.CaptureMouse"],
           "to": "Actions.DeltaYaw",
           "filters":
             [
@@ -213,8 +125,17 @@
             ]
         },
 
+        { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
+          "to": "Actions.DeltaYaw",
+          "when": "Application.CaptureMouse",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.2 }
+            ]
+        },
+
         { "from": { "makeAxis" : ["Keyboard.MouseMoveUp", "Keyboard.MouseMoveDown"] },
-          "when": ["!Application.CameraSelfie", "!Application.CameraLookAt", "Keyboard.RightMouseButton"],
+          "when": ["!Application.CameraSelfie", "!Application.CameraLookAt", "!Application.CaptureMouse", "Keyboard.RightMouseButton"],
           "to": "Actions.DeltaPitch",
           "filters":
             [
@@ -222,6 +143,15 @@
             ]
         },
 
+        { "from": { "makeAxis" : ["Keyboard.MouseMoveUp", "Keyboard.MouseMoveDown"] },
+          "to": "Actions.DeltaPitch",
+          "when": "Application.CaptureMouse",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.2 }
+            ]
+        },
+
         { "from": { "makeAxis" : ["Keyboard.MouseMoveUp", "Keyboard.MouseMoveDown"] },
           "when": ["Application.CameraLookAt", "Keyboard.RightMouseButton"],
           "to": "Actions.DeltaPitch",

interface/resources/qml/+webengine/BrowserWebView.qml

@@ -8,7 +8,6 @@ WebView {
     id: webview
     url: "https://vircadia.com/"
     profile: FileTypeProfile;
-
     property var parentRoot: null
 
     // Create a global EventBridge object for raiseAndLowerKeyboard.

interface/resources/qml/Web3DSurface.qml

@@ -3,6 +3,7 @@
 //
 //  Created by David Rowe on 16 Dec 2016.
 //  Copyright 2016 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -17,22 +18,31 @@ Item {
     anchors.fill: parent
     property string url: ""
     property string scriptUrl: null
+    property bool useBackground: true
 
     onUrlChanged: {
-        load(root.url, root.scriptUrl);
+        load(root.url, root.scriptUrl, root.useBackground);
     }
 
     onScriptUrlChanged: {
         if (root.item) {
             root.item.scriptUrl = root.scriptUrl;
         } else {
-            load(root.url, root.scriptUrl);
+            load(root.url, root.scriptUrl, root.useBackground);
+        }
+    }
+
+    onUseBackgroundChanged: {
+        if (root.item) {
+            root.item.useBackground = root.useBackground;
+        } else {
+            load(root.url, root.scriptUrl, root.useBackground);
         }
     }
 
     property var item: null
 
-    function load(url, scriptUrl) {
+    function load(url, scriptUrl, useBackground) {
         // Ensure we reset any existing item to "about:blank" to ensure web audio stops: DEV-2375
         if (root.item != null) {
             root.item.url = "about:blank"
@@ -43,11 +53,12 @@ Item {
             root.item = newItem
             root.item.url = url
             root.item.scriptUrl = scriptUrl
+            root.item.useBackground = useBackground
         })
     }
 
     Component.onCompleted: {
-        load(root.url, root.scriptUrl);
+        load(root.url, root.scriptUrl, root.useBackground);
     }
 
     signal sendToScript(var message);

interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml

@@ -16,6 +16,7 @@ Item {
     property alias webViewCoreProfile: webViewCore.profile
     property string webViewCoreUserAgent
 
+    property bool useBackground: webViewCore.useBackground
     property string userScriptUrl: ""
     property string urlTag: "noDownload=false";
 
@@ -98,6 +99,7 @@ Item {
 
         width: parent.width
         height: parent.height
+        backgroundColor: (flick.useBackground) ? "white" : "transparent"
 
         profile: HFWebEngineProfile;
         settings.pluginsEnabled: true

interface/resources/qml/controls/FlickableWebViewCore.qml

@@ -14,6 +14,7 @@ Item {
     property alias webViewCoreProfile: webViewCore.profile
     property string webViewCoreUserAgent
 
+    property bool useBackground: webViewCore.useBackground
     property string userScriptUrl: ""
     property string urlTag: "noDownload=false";
 

interface/resources/qml/controls/WebView.qml

@@ -23,6 +23,7 @@ Item {
     property bool passwordField: false
     property alias flickable: webroot.interactive
     property alias blurOnCtrlShift: webroot.blurOnCtrlShift
+    property alias useBackground: webroot.useBackground
 
     function stop() {
         webroot.stop();

interface/resources/qml/hifi/AssetServer.qml

@@ -148,7 +148,7 @@ Windows.ScrollingWindow {
     }
 
     function canAddToWorld(path) {
-        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i];
+        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i, /\.glb\b/i];
 
         if (selectedItemCount > 1) {
             return false;

interface/resources/qml/hifi/avatarapp/AvatarsModel.qml

@@ -49,7 +49,13 @@ ListModel {
     }
 
     function makeAvatarObject(avatar, avatarName) {
-        var avatarThumbnailUrl = makeThumbnailUrl(avatar.avatarUrl);
+        var avatarThumbnailUrl;
+
+        if (!avatar.avatarIcon) {
+            avatarThumbnailUrl = makeThumbnailUrl(avatar.avatarUrl);
+        } else {
+            avatarThumbnailUrl = avatar.avatarIcon;
+        }
 
         return {
             'name' : avatarName,

interface/resources/qml/hifi/avatarapp/Settings.qml

@@ -456,7 +456,7 @@ Rectangle {
                 id: avatarCollisionSoundUrlInputText
                 font.pixelSize: 17
                 Layout.fillWidth: true
-                placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-'
+                placeholderText: "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/sounds/Collisions-"
 
                 onFocusChanged: {
                     keyboardRaised = (avatarAnimationUrlInputText.focus || avatarCollisionSoundUrlInputText.focus);

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

@@ -148,7 +148,7 @@ Rectangle {
     }
 
     function canAddToWorld(path) {
-        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i];
+        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i, /\.gltf\b/i, /\.glb\b/i];
 
         if (selectedItemCount > 1) {
             return false;

interface/resources/qml/hifi/models/S3Model.qml

@@ -25,7 +25,7 @@ XmlListModel {
     readonly property string realPrefix: prefix.match('.*/$') ? prefix : (prefix + "/")
     readonly property string nameRegex: realPrefix + (filter ? (".*" + filter) :  "") + ".*\." + extension
     readonly property string nameQuery: "Key/substring-before(substring-after(string(), '" + prefix + "'), '." + extension + "')"
-    readonly property string baseUrl: "http://s3.amazonaws.com/hifi-public"
+    readonly property string baseUrl: "https://cdn-1.vircadia.com/eu-c-1/vircadia-public"
 
     // FIXME need to urlencode prefix?
     source: baseUrl + "?prefix=" + realPrefix

interface/resources/qml/hifi/tablet/ControllerSettings.qml

@@ -27,6 +27,7 @@ Item {
     width: parent.width
 
     property string title: "Controls"
+    property var openVRDevices: ["HTC Vive", "Valve Index", "Valve HMD", "Valve"]
 
     HifiConstants { id: hifi }
 
@@ -244,7 +245,7 @@ Item {
                     source: InputConfiguration.configurationLayout(box.textAt(box.currentIndex));
                     onLoaded: {
                         if (loader.item.hasOwnProperty("pluginName")) {
-                            if (box.textAt(box.currentIndex) === "HTC Vive") {
+                            if (openVRDevices.indexOf(box.textAt(box.currentIndex)) !== -1) {
                                 loader.item.pluginName = "OpenVR";
                             } else {
                                 loader.item.pluginName = box.textAt(box.currentIndex);
@@ -298,7 +299,7 @@ Item {
                 loader.source = "";
                 var selectedDevice = box.textAt(box.currentIndex);
                 var source = "";
-                if (selectedDevice == "HTC Vive") {
+                if (openVRDevices.indexOf(selectedDevice) !== -1) {
                     source = InputConfiguration.configurationLayout("OpenVR");
                 } else {
                     source = InputConfiguration.configurationLayout(selectedDevice);

interface/resources/serverless/redirect.json

@@ -296,7 +296,7 @@
             "lastEdited": 1537901430334966,
             "lastEditedBy": "{69540019-db48-4375-86c8-ac1a4a90d043}",
             "locked": true,
-            "modelURL": "http://hifi-content.s3.amazonaws.com/alexia/LoadingScreens/floor.fbx",
+            "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/alexia/LoadingScreens/floor.fbx",
             "name": "floorModel",
             "owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
             "position": {

interface/src/AboutUtil.cpp

@@ -45,6 +45,16 @@ QString AboutUtil::getQtVersion() const {
 }
 
 void AboutUtil::openUrl(const QString& url) const {
+    auto abboutUtilInstance = AboutUtil::getInstance();
+    if (!abboutUtilInstance) {
+        return;
+    }
+
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(abboutUtilInstance, "openUrl", Q_ARG(const QString&, url));
+        return;
+    }
+
     auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
     auto hmd = DependencyManager::get<HMDScriptingInterface>();
     auto offscreenUi = DependencyManager::get<OffscreenUi>();

interface/src/AboutUtil.h

@@ -79,7 +79,7 @@ public:
 public slots:
 
     /**jsdoc
-     * Display a web page in an Interface browser window.
+     * Display a web page in an Interface browser window or the tablet.
      * @function About.openUrl
      * @param {string} url - The URL of the web page you want to view in Interface.
      */

interface/src/Application.cpp

@@ -253,6 +253,7 @@
 #include <DesktopPreviewProvider.h>
 
 #include "AboutUtil.h"
+#include "ExternalResource.h"
 
 #if defined(Q_OS_WIN)
 #include <VersionHelpers.h>
@@ -680,6 +681,9 @@ private:
  *     <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr>
  *     <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr>
  *     <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr>
+ *     <tr><td><code>CaptureMouse</code></td><td>number</td><td>number</td><td>The mouse is captured.  In this mode,
+ *       the mouse is invisible and cannot leave the bounds of Interface, as long as Interface is the active window and
+ *       no menu item is selected.</td></tr>
  *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are
  *       enabled.</td></tr>
  *     <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr>
@@ -715,6 +719,7 @@ static const QString STATE_PLATFORM_ANDROID = "PlatformAndroid";
 static const QString STATE_LEFT_HAND_DOMINANT = "LeftHandDominant";
 static const QString STATE_RIGHT_HAND_DOMINANT = "RightHandDominant";
 static const QString STATE_STRAFE_ENABLED = "StrafeEnabled";
+static const QString STATE_CAPTURE_MOUSE = "CaptureMouse";
 
 // Statically provided display and input plugins
 extern DisplayPluginList getDisplayPlugins();
@@ -918,7 +923,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<MessagesClient>();
     controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR,
                     STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_FIRST_PERSON_LOOK_AT, STATE_CAMERA_THIRD_PERSON,
-                    STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE,
+                    STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE, STATE_CAPTURE_MOUSE,
                     STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED,
                     STATE_PLATFORM_WINDOWS, STATE_PLATFORM_MAC, STATE_PLATFORM_ANDROID, STATE_LEFT_HAND_DOMINANT, STATE_RIGHT_HAND_DOMINANT, STATE_STRAFE_ENABLED } });
     DependencyManager::set<UserInputMapper>();
@@ -1891,6 +1896,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float {
         return qApp->getCamera().getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0;
     });
+    _applicationStateDevice->setInputVariant(STATE_CAPTURE_MOUSE, []() -> float {
+        return qApp->getCamera().getCaptureMouse() ? 1 : 0;
+    });
     _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float {
         return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0;
     });
@@ -2406,6 +2414,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     updateSystemTabletMode();
 
     connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
+    connect(&_myCamera, &Camera::captureMouseChanged, this, &Application::captureMouseChanged);
 
     DependencyManager::get<PickManager>()->setShouldPickHUDOperator([]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
     DependencyManager::get<PickManager>()->setCalculatePos2DFromHUDOperator([this](const glm::vec3& intersection) {
@@ -3515,6 +3524,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
     surfaceContext->setContextProperty("About", AboutUtil::getInstance());
     surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());  // Deprecated
     surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
+    surfaceContext->setContextProperty("ExternalResource", ExternalResource::getInstance());
 
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
         surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
@@ -3629,6 +3639,8 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona
         surfaceContext->setContextProperty("WalletScriptingInterface", DependencyManager::get<WalletScriptingInterface>().data());
         surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
         surfaceContext->setContextProperty("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
+        surfaceContext->setContextProperty("ExternalResource", ExternalResource::getInstance());
+
         // This `module` context property is blank for the QML scripting interface so that we don't get log errors when importing
         // certain JS files from both scripts (in the JS context) and QML (in the QML context).
         surfaceContext->setContextProperty("module", "");
@@ -4700,6 +4712,11 @@ void Application::maybeToggleMenuVisible(QMouseEvent* event) const {
 void Application::mouseMoveEvent(QMouseEvent* event) {
     PROFILE_RANGE(app_input_mouse, __FUNCTION__);
 
+    if (_ignoreMouseMove) {
+        _ignoreMouseMove = false;
+        return;
+    }
+
     maybeToggleMenuVisible(event);
 
     auto& compositor = getApplicationCompositor();
@@ -4745,7 +4762,7 @@ void Application::mouseMoveEvent(QMouseEvent* event) {
     }
 
     if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->mouseMoveEvent(event);
+        _keyboardMouseDevice->mouseMoveEvent(event, _captureMouse, _mouseCaptureTarget);
     }
 }
 
@@ -5539,6 +5556,19 @@ void Application::loadSettings() {
     }
 
     getMyAvatar()->loadData();
+
+    auto bucketEnum = QMetaEnum::fromType<ExternalResource::Bucket>();
+    auto externalResource = ExternalResource::getInstance();
+
+    for (int i = 0; i < bucketEnum.keyCount(); i++) {
+        const char* keyName = bucketEnum.key(i);
+        QString setting("ExternalResource/");
+        setting += keyName;
+        auto bucket = static_cast<ExternalResource::Bucket>(bucketEnum.keyToValue(keyName));
+        Setting::Handle<QString> url(setting, externalResource->getBase(bucket));
+        externalResource->setBase(bucket, url.get());
+    }
+
     _settingsLoaded = true;
 }
 
@@ -5555,6 +5585,22 @@ void Application::saveSettings() const {
     Menu::getInstance()->saveSettings();
     getMyAvatar()->saveData();
     PluginManager::getInstance()->saveSettings();
+
+    // Don't save external resource paths until such time as there's UI to select or set alternatives. Otherwise new default
+    // values won't be used unless Interface.json entries are manually remove or Interface.json is deleted.
+    /*
+    auto bucketEnum = QMetaEnum::fromType<ExternalResource::Bucket>();
+    auto externalResource = ExternalResource::getInstance();
+
+    for (int i = 0; i < bucketEnum.keyCount(); i++) {
+        const char* keyName = bucketEnum.key(i);
+        QString setting("ExternalResource/");
+        setting += keyName;
+        auto bucket = static_cast<ExternalResource::Bucket>(bucketEnum.keyToValue(keyName));
+        Setting::Handle<QString> url(setting, externalResource->getBase(bucket));
+        url.set(externalResource->getBase(bucket));
+    }
+    */
 }
 
 bool Application::importEntities(const QString& urlOrFilename, const bool isObservable, const qint64 callerId) {
@@ -5917,6 +5963,20 @@ void Application::cameraModeChanged() {
     cameraMenuChanged();
 }
 
+bool Application::shouldCaptureMouse() const {
+    return _captureMouse && _glWidget->isActiveWindow() && !ui::Menu::isSomeSubmenuShown();
+}
+
+void Application::captureMouseChanged(bool captureMouse) {
+    _captureMouse = captureMouse;
+    if (_captureMouse) {
+        _glWidget->setCursor(QCursor(Qt::BlankCursor));
+    } else {
+        _mouseCaptureTarget = QPointF(NAN, NAN);
+        _glWidget->unsetCursor();
+    }
+}
+
 void Application::changeViewAsNeeded(float boomLength) {
     // Switch between first and third person views as needed
     // This is called when the boom length has changed
@@ -6267,6 +6327,15 @@ void Application::update(float deltaTime) {
         PROFILE_ASYNC_END(app, "Scene Loading", "");
     }
 
+     if (shouldCaptureMouse()) {
+        QPoint point = _glWidget->mapToGlobal(_glWidget->geometry().center());
+        if (QCursor::pos() != point) {
+            _mouseCaptureTarget = point;
+            _ignoreMouseMove = true;
+            QCursor::setPos(point);
+        }
+    }
+
     auto myAvatar = getMyAvatar();
     {
         PerformanceTimer perfTimer("devices");
@@ -6322,8 +6391,8 @@ void Application::update(float deltaTime) {
                 if (deltaTime > FLT_EPSILON && userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z)  == 0.0f) {
                     myAvatar->setDriveKey(MyAvatar::PITCH, -1.0f * userInputMapper->getActionState(controller::Action::PITCH));
                     myAvatar->setDriveKey(MyAvatar::YAW, -1.0f * userInputMapper->getActionState(controller::Action::YAW));
-                    myAvatar->setDriveKey(MyAvatar::DELTA_PITCH, -1.0f * userInputMapper->getActionState(controller::Action::DELTA_PITCH));
-                    myAvatar->setDriveKey(MyAvatar::DELTA_YAW, -1.0f * userInputMapper->getActionState(controller::Action::DELTA_YAW));
+                    myAvatar->setDriveKey(MyAvatar::DELTA_PITCH, -_myCamera.getSensitivity() * userInputMapper->getActionState(controller::Action::DELTA_PITCH));
+                    myAvatar->setDriveKey(MyAvatar::DELTA_YAW, -_myCamera.getSensitivity() * userInputMapper->getActionState(controller::Action::DELTA_YAW));
                     myAvatar->setDriveKey(MyAvatar::STEP_YAW, -1.0f * userInputMapper->getActionState(controller::Action::STEP_YAW));
                 }
             }
@@ -7110,9 +7179,9 @@ void Application::updateWindowTitle() const {
     QString currentPlaceName;
     if (isServerlessMode()) {
         if (isInErrorState) {
-            currentPlaceName = "serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
+            currentPlaceName = "Serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
         } else {
-            currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
+            currentPlaceName = "Serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
         }
     } else {
         currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host();
@@ -7123,7 +7192,7 @@ void Application::updateWindowTitle() const {
 
     QString metaverseDetails;
     if (isMetaverseLoggedIn) {
-        metaverseDetails = " (Metaverse: Logged in as " + metaverseUsername + ")";
+        metaverseDetails = " (Metaverse: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() + " as " + metaverseUsername + ")";
     } else {
         metaverseDetails = " (Metaverse: Not Logged In)";
     }
@@ -7669,7 +7738,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
 
     QUrl scriptURL { scriptFilenameOrURL };
 
-    if (scriptURL.host().endsWith(NetworkingConstants::MARKETPLACE_CDN_HOSTNAME)) {
+    if (scriptURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
         int startIndex = shortName.lastIndexOf('/') + 1;
         int endIndex = shortName.lastIndexOf('?');
         shortName = shortName.mid(startIndex, endIndex - startIndex);
@@ -7792,7 +7861,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
     const int MAX_CHARACTERS_PER_LINE = 90;
     if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
         QUrl originURL { url };
-        if (originURL.host().endsWith(NetworkingConstants::MARKETPLACE_CDN_HOSTNAME)) {
+        if (originURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
             // Create a confirmation dialog when this call is made
             static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
                 "If you want to save what you have now, create a backup before proceeding. For more information about backing up "

interface/src/Application.h

@@ -4,6 +4,7 @@
 //
 //  Created by Andrzej Kapolka on 5/10/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -430,6 +431,7 @@ public slots:
     void cycleCamera();
     void cameraModeChanged();
     void cameraMenuChanged();
+    void captureMouseChanged(bool captureMouse);
     void toggleOverlays();
     void setOverlaysVisible(bool visible);
     Q_INVOKABLE void centerUI();
@@ -602,6 +604,7 @@ private:
 
     void maybeToggleMenuVisible(QMouseEvent* event) const;
     void toggleTabletUI(bool shouldOpen = false) const;
+    bool shouldCaptureMouse() const;
 
     void userKickConfirmation(const QUuid& nodeID);
 
@@ -755,7 +758,9 @@ private:
 
     bool _settingsLoaded { false };
 
-    bool _fakedMouseEvent { false };
+    bool _captureMouse { false };
+    bool _ignoreMouseMove { false };
+    QPointF _mouseCaptureTarget { NAN, NAN };
 
     bool _isMissingSequenceNumbers { false };
 

interface/src/AvatarBookmarks.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Triplelexx on 23/03/17.
 //  Copyright 2017 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -282,12 +283,14 @@ QVariantMap AvatarBookmarks::getAvatarDataToBookmark() {
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
 
     const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString();
+    const QString& avatarIcon = QString("");
     const QVariant& avatarScale = myAvatar->getAvatarScale();
 
     // If Avatar attachments ever change, this is where to update them, when saving remember to also append to AVATAR_BOOKMARK_VERSION
     QVariantMap bookmark;
     bookmark.insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION);
     bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
+    bookmark.insert(ENTRY_AVATAR_ICON, avatarIcon);
     bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
 
     QVariantList wearableEntities;

interface/src/AvatarBookmarks.h

@@ -4,6 +4,7 @@
 //
 //  Created by Triplelexx on 23/03/17.
 //  Copyright 2017 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -148,6 +149,7 @@ protected slots:
 private:
     const QString AVATARBOOKMARKS_FILENAME = "avatarbookmarks.json";
     const QString ENTRY_AVATAR_URL = "avatarUrl";
+    const QString ENTRY_AVATAR_ICON = "avatarIcon";
     const QString ENTRY_AVATAR_ATTACHMENTS = "attachments";
     const QString ENTRY_AVATAR_ENTITIES = "avatarEntites";
     const QString ENTRY_AVATAR_SCALE = "avatarScale";

interface/src/Constants.h

@@ -4,6 +4,7 @@
 //
 //  Created by Gabriel Calero on 9/28/18.
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -12,4 +13,4 @@
 #pragma once
 #include <QString>
 
-static const QString API_SIGNUP_PATH = "api/v1/users";
+static const QString API_SIGNUP_PATH = "/api/v1/users";

interface/src/FancyCamera.h

@@ -36,6 +36,10 @@ class FancyCamera : public Camera {
      * @property {ViewFrustum} frustum - The camera frustum.
      * @property {Uuid} cameraEntity - The ID of the entity that is used for the camera position and orientation when the 
      *     camera is in entity mode.
+     * @property {boolean} captureMouse - The mouse capture state.  When <code>true</code>, the mouse is invisible and cannot leave the bounds of
+     * Interface, as long as Interface is the active window and no menu item is selected.  When <code>false</code>, the mouse
+     * behaves normally.
+     * @property {number} sensitivity - The current camera sensitivity.  Must be positive.
      */
     Q_PROPERTY(QUuid cameraEntity READ getCameraEntity WRITE setCameraEntity)
 

interface/src/avatar/MyAvatar.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Mark Peng on 8/16/13.
 //  Copyright 2012 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -25,31 +26,33 @@
 #include <scripting/HMDScriptingInterface.h>
 #include <AccountManager.h>
 #include <AddressManager.h>
+#include <AnimDebugDraw.h>
+#include <AnimClip.h>
+#include <AnimInverseKinematics.h>
 #include <AudioClient.h>
 #include <ClientTraitsHandler.h>
+#include <recording/Clip.h>
+#include <recording/Deck.h>
 #include <display-plugins/DisplayPlugin.h>
+#include <recording/Frame.h>
 #include <FSTReader.h>
 #include <GeometryUtil.h>
+#include <GLMHelpers.h>
 #include <NodeList.h>
+#include <NetworkingConstants.h>
 #include <udt/PacketHeaders.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <SharedUtil.h>
 #include <SoundCache.h>
 #include <ModelEntityItem.h>
-#include <GLMHelpers.h>
 #include <TextRenderer3D.h>
 #include <UserActivityLogger.h>
-#include <AnimDebugDraw.h>
-#include <AnimClip.h>
-#include <AnimInverseKinematics.h>
-#include <recording/Deck.h>
 #include <recording/Recorder.h>
-#include <recording/Clip.h>
-#include <recording/Frame.h>
 #include <RecordingScriptingInterface.h>
 #include <RenderableModelEntityItem.h>
 #include <VariantMapToScriptValue.h>
+#include <NetworkingConstants.h>
 
 #include "MyHead.h"
 #include "MySkeletonModel.h"
@@ -82,7 +85,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1;
 const int SCRIPTED_MOTOR_WORLD_FRAME = 2;
 const int SCRIPTED_MOTOR_SIMPLE_MODE = 0;
 const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1;
-const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav";
+const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = NetworkingConstants::HF_PUBLIC_CDN_URL + "sounds/Collisions-otherorganic/Body_Hits_Impact.wav";
 
 const float MyAvatar::ZOOM_MIN = 0.5f;
 const float MyAvatar::ZOOM_MAX = 25.0f;

interface/src/avatar/OtherAvatar.cpp

@@ -168,6 +168,7 @@ const btCollisionShape* OtherAvatar::createCollisionShape(int32_t jointIndex, bo
         }
         // Note: MultiSphereLow case really means: "skip fingers and use spheres for hands,
         // else fall through to MultiSphereHigh case"
+        /* fall-thru */
     case BodyLOD::MultiSphereHigh:
         computeDetailedShapeInfo(shapeInfo, jointIndex);
         break;

interface/src/commerce/Wallet.cpp

@@ -288,8 +288,10 @@ Wallet::Wallet() {
     auto& packetReceiver = nodeList->getPacketReceiver();
     _passphrase = new QString("");
 
-    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnershipPacket");
-    packetReceiver.registerListener(PacketType::ChallengeOwnershipRequest, this, "handleChallengeOwnershipPacket");
+    packetReceiver.registerListener(PacketType::ChallengeOwnership,
+        PacketReceiver::makeSourcedListenerReference<Wallet>(this, &Wallet::handleChallengeOwnershipPacket));
+    packetReceiver.registerListener(PacketType::ChallengeOwnershipRequest,
+        PacketReceiver::makeSourcedListenerReference<Wallet>(this, &Wallet::handleChallengeOwnershipPacket));
 
     connect(ledger.data(), &Ledger::accountResult, this, [](QJsonObject result) {
         auto wallet = DependencyManager::get<Wallet>();

interface/src/main.cpp

@@ -81,7 +81,7 @@ int main(int argc, const char* argv[]) {
     QCommandLineOption noUpdaterOption("no-updater", "Do not show auto-updater");
     QCommandLineOption checkMinSpecOption("checkMinSpec", "Check if machine meets minimum specifications");
     QCommandLineOption runServerOption("runServer", "Whether to run the server");
-    QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath");
+    QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content <path>", "serverContentPath");
     QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run");
     QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir");
     QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path");

interface/src/networking/CloseEventSender.cpp

@@ -30,7 +30,7 @@ QNetworkRequest createNetworkRequest() {
     QNetworkRequest request;
 
     QUrl requestURL = MetaverseAPI::getCurrentMetaverseServerURL();
-    requestURL.setPath(USER_ACTIVITY_URL);
+    requestURL.setPath(MetaverseAPI::getCurrentMetaverseServerURLPath() + USER_ACTIVITY_URL);
 
     request.setUrl(requestURL);
 

interface/src/octree/OctreePacketProcessor.cpp

@@ -25,7 +25,8 @@ OctreePacketProcessor::OctreePacketProcessor():
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     const PacketReceiver::PacketTypeList octreePackets =
         { PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase, PacketType::EntityQueryInitialResultsComplete };
-    packetReceiver.registerDirectListenerForTypes(octreePackets, this, "handleOctreePacket");
+    packetReceiver.registerDirectListenerForTypes(octreePackets,
+        PacketReceiver::makeSourcedListenerReference<OctreePacketProcessor>(this, &OctreePacketProcessor::handleOctreePacket));
 }
 
 OctreePacketProcessor::~OctreePacketProcessor() { }

interface/src/scripting/ScreenshareScriptingInterface.cpp

@@ -18,11 +18,13 @@
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <DependencyManager.h>
+#include <NetworkingConstants.h>
 #include <NodeList.h>
 #include <UUID.h>
 
 #include "EntityScriptingInterface.h"
 #include "ScreenshareScriptingInterface.h"
+#include "ExternalResource.h"
 
 static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300;
 ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
@@ -42,7 +44,8 @@ ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
     // This packet listener handles the packet containing information about the latest zone ID in which we are allowed to share.
     auto nodeList = DependencyManager::get<NodeList>();
     PacketReceiver& packetReceiver = nodeList->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::AvatarZonePresence, this, "processAvatarZonePresencePacketOnClient");
+    packetReceiver.registerListener(PacketType::AvatarZonePresence,
+        PacketReceiver::makeUnsourcedListenerReference<ScreenshareScriptingInterface>(this, &ScreenshareScriptingInterface::processAvatarZonePresencePacketOnClient));
 };
 
 ScreenshareScriptingInterface::~ScreenshareScriptingInterface() {
@@ -108,7 +111,7 @@ void ScreenshareScriptingInterface::requestScreenshareInfo() {
     // See `DomainServer::screensharePresence()` for more info about that.
 
     QString currentDomainID = uuidStringWithoutCurlyBraces(addressManager->getDomainID());
-    QString requestURLPath = "api/v1/domains/%1/screenshare";
+    QString requestURLPath = "/api/v1/domains/%1/screenshare";
     JSONCallbackParameters callbackParams;
     callbackParams.callbackReceiver = this;
     callbackParams.jsonCallbackMethod = "handleSuccessfulScreenshareInfoGet";
@@ -128,8 +131,9 @@ static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30;
 // The `z` value here is dynamic.
 static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f);
 static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f);
-static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL =
-    "https://content.highfidelity.com/Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html";
+static const ExternalResource::Bucket LOCAL_SCREENSHARE_WEB_ENTITY_BUCKET = ExternalResource::Bucket::HF_Content;
+static const QString LOCAL_SCREENSHARE_WEB_ENTITY_PATH = 
+    "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html";
 static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";
 void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,
                                                      const QUuid& smartboardEntityID,
@@ -281,6 +285,8 @@ void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkR
     glm::vec3 localPosition(LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION);
     localPosition.z = _localWebEntityZOffset;
     localScreenshareWebEntityProps.setLocalPosition(localPosition);
+    auto LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(LOCAL_SCREENSHARE_WEB_ENTITY_BUCKET,
+        LOCAL_SCREENSHARE_WEB_ENTITY_PATH);
     localScreenshareWebEntityProps.setSourceUrl(LOCAL_SCREENSHARE_WEB_ENTITY_URL);
     localScreenshareWebEntityProps.setParentID(_smartboardEntityID);
     localScreenshareWebEntityProps.setDimensions(LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS);

interface/src/scripting/TestScriptingInterface.cpp

@@ -20,6 +20,7 @@
 #include <Trace.h>
 
 #include "Application.h"
+#include "NetworkingConstants.h"
 
 Q_LOGGING_CATEGORY(trace_test, "trace.test")
 
@@ -66,8 +67,8 @@ bool TestScriptingInterface::loadTestScene(QString scene) {
         return result;
     }
 
-    static const QString TEST_ROOT = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/";
-    static const QString TEST_BINARY_ROOT = "https://hifi-public.s3.amazonaws.com/test_scene_data/";
+    static const QString TEST_ROOT = "https://raw.githubusercontent.com/hifi-archive/hifi_tests/master/";
+    static const QString TEST_BINARY_ROOT = NetworkingConstants::HF_CONTENT_CDN_URL + "test_scene_data/";
     static const QString TEST_SCRIPTS_ROOT = TEST_ROOT + "scripts/";
     static const QString TEST_SCENES_ROOT = TEST_ROOT + "scenes/";
     

interface/src/scripting/WindowScriptingInterface.cpp

@@ -645,12 +645,16 @@ void WindowScriptingInterface::setActiveDisplayPlugin(int index) {
     qApp->setActiveDisplayPlugin(name);
 }
 
-void WindowScriptingInterface::openWebBrowser() {
+void WindowScriptingInterface::openWebBrowser(const QString& url) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "openWebBrowser", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(this, "openWebBrowser", Q_ARG(const QString&, url));
         return;
     }
 
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->load("Browser.qml");
+    offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+        if (!url.isEmpty()) {
+            newObject->setProperty("url", url);
+        }
+    });
 }

interface/src/scripting/WindowScriptingInterface.h

@@ -616,10 +616,11 @@ public slots:
     void setActiveDisplayPlugin(int index);
 
     /**jsdoc
-     * Opens a web browser in a pop-up window.
+     * Opens an Interface web browser window.
      * @function Window.openWebBrowser
+     * @param {string} [url=""] - The URL of the web page to display.
      */
-    void openWebBrowser();
+    void openWebBrowser(const QString& url = "");
 
 
 private slots:

interface/src/ui/DomainConnectionModel.cpp

@@ -9,7 +9,8 @@
 //
 
 #include "DomainConnectionModel.h"
-#include <QLoggingCategory>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QMetaMethod>
 
 #include <NodeList.h>
 #include <NumericalConstants.h>

interface/src/ui/LogDialog.cpp

@@ -167,6 +167,13 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog
     }
     _extraDebuggingBox->show();
     connect(_extraDebuggingBox, &QCheckBox::stateChanged, this, &LogDialog::handleExtraDebuggingCheckbox);
+    
+    _showSourceDebuggingBox = new QCheckBox("Show script sources", this);
+    if (_logger->showSourceDebugging()) {
+        _showSourceDebuggingBox->setCheckState(Qt::Checked);
+    }
+    _showSourceDebuggingBox->show();
+    connect(_showSourceDebuggingBox, &QCheckBox::stateChanged, this, &LogDialog::handleShowSourceDebuggingCheckbox);
 
     _allLogsButton = new QPushButton("All Messages", this);
     // set object name for css styling
@@ -196,8 +203,13 @@ void LogDialog::resizeEvent(QResizeEvent* event) {
         THIRD_ROW,
         COMBOBOX_WIDTH,
         ELEMENT_HEIGHT);
-
-     _keepOnTopBox->setGeometry(width() - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN - ALL_LOGS_BUTTON_WIDTH - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN,
+    _keepOnTopBox->setGeometry(width() - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN - ALL_LOGS_BUTTON_WIDTH - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN,
+        THIRD_ROW,
+        COMBOBOX_WIDTH,
+        ELEMENT_HEIGHT);
+    _showSourceDebuggingBox->setGeometry(width() - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN - ALL_LOGS_BUTTON_WIDTH
+                                                 - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN - ELEMENT_MARGIN
+                                                 - COMBOBOX_WIDTH - ELEMENT_MARGIN,
         THIRD_ROW,
         COMBOBOX_WIDTH,
         ELEMENT_HEIGHT);
@@ -217,6 +229,8 @@ void LogDialog::handleRevealButton() {
 }
 
 void LogDialog::handleAllLogsButton() {
+    _logger->setShowSourceDebugging(false);
+    _showSourceDebuggingBox->setCheckState(Qt::Unchecked);
     _logger->setExtraDebugging(false);
     _extraDebuggingBox->setCheckState(Qt::Unchecked);
     _logger->setDebugPrint(true);
@@ -238,6 +252,10 @@ void LogDialog::handleAllLogsButton() {
     printLogFile();
 }
 
+void LogDialog::handleShowSourceDebuggingCheckbox(int state) {
+    _logger->setShowSourceDebugging(state != 0);
+}
+
 void LogDialog::handleExtraDebuggingCheckbox(int state) {
     _logger->setExtraDebugging(state != 0);
 }

interface/src/ui/LogDialog.h

@@ -33,6 +33,7 @@ public slots:
 
 private slots:
     void handleRevealButton();
+    void handleShowSourceDebuggingCheckbox(int);
     void handleExtraDebuggingCheckbox(int);
     void handleKeepWindowOnTop(int);
     void handleDebugPrintBox(int);
@@ -55,6 +56,7 @@ protected:
     
 
 private:
+    QCheckBox* _showSourceDebuggingBox;
     QCheckBox* _extraDebuggingBox;
     QCheckBox* _keepOnTopBox;
     QPushButton* _revealLogButton;

interface/src/ui/LoginDialog.cpp

@@ -172,7 +172,7 @@ void LoginDialog::linkOculus() {
             callbackParams.callbackReceiver = this;
             callbackParams.jsonCallbackMethod = "linkCompleted";
             callbackParams.errorCallbackMethod = "linkFailed";
-            const QString LINK_OCULUS_PATH = "api/v1/user/oculus/link";
+            const QString LINK_OCULUS_PATH = "/api/v1/user/oculus/link";
 
             QJsonObject payload;
             payload["oculus_nonce"] = nonce;
@@ -200,7 +200,7 @@ void LoginDialog::createAccountFromOculus(QString email, QString username, QStri
             callbackParams.jsonCallbackMethod = "createCompleted";
             callbackParams.errorCallbackMethod = "createFailed";
 
-            const QString CREATE_ACCOUNT_FROM_OCULUS_PATH = "api/v1/user/oculus/create";
+            const QString CREATE_ACCOUNT_FROM_OCULUS_PATH = "/api/v1/user/oculus/create";
 
             QJsonObject payload;
             payload["oculus_nonce"] = nonce;
@@ -251,7 +251,7 @@ void LoginDialog::linkSteam() {
             callbackParams.jsonCallbackMethod = "linkCompleted";
             callbackParams.errorCallbackMethod = "linkFailed";
 
-            const QString LINK_STEAM_PATH = "api/v1/user/steam/link";
+            const QString LINK_STEAM_PATH = "/api/v1/user/steam/link";
 
             QJsonObject payload;
             payload["steam_auth_ticket"] = QJsonValue::fromVariant(QVariant(ticket));
@@ -278,7 +278,7 @@ void LoginDialog::createAccountFromSteam(QString username) {
             callbackParams.jsonCallbackMethod = "createCompleted";
             callbackParams.errorCallbackMethod = "createFailed";
 
-            const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "api/v1/user/steam/create";
+            const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "/api/v1/user/steam/create";
 
             QJsonObject payload;
             payload["steam_auth_ticket"] = QJsonValue::fromVariant(QVariant(ticket));

interface/src/ui/ModelsBrowser.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Clement on 3/17/14.
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -32,8 +33,8 @@
 
 const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" };
 
-static const QString S3_URL = "http://s3.amazonaws.com/hifi-public";
-static const QString PUBLIC_URL = "http://public.highfidelity.io";
+static const QString S3_URL = NetworkingConstants::HF_PUBLIC_CDN_URL;
+static const QString PUBLIC_URL = "http://public.vircadia.com"; // Changed to Vircadia but not entirely sure what to do with this yet.
 static const QString MODELS_LOCATION = "models/";
 
 static const QString PREFIX_PARAMETER_NAME = "prefix";

interface/src/ui/OctreeStatsDialog.cpp

@@ -424,6 +424,7 @@ void OctreeStatsDialog::showOctreeServersOfType(NodeType_t serverType) {
                                 extraDetails << "<br/>" << itemInfo.caption << " " << stats.getItemValue(item);
                             }
                         } // fall through... since MOST has all of MORE
+                        /* fall-thru */
                         case MORE: {
                             QString totalString = locale.toString((uint)stats.getTotalElements());
                             QString internalString = locale.toString((uint)stats.getTotalInternal());

interface/src/ui/PreferencesDialog.cpp

@@ -358,6 +358,16 @@ void setupPreferences() {
         preference->setItems(items);
         preferences->addPreference(preference);
     }
+    {
+        auto getter = [myAvatar]()->float { return qApp->getCamera().getSensitivity(); };
+        auto setter = [myAvatar](float value) { qApp->getCamera().setSensitivity(value); };
+        auto preference = new SpinnerSliderPreference(VR_MOVEMENT, "Camera Sensitivity", getter, setter);
+        preference->setMin(0.01f);
+        preference->setMax(5.0f);
+        preference->setStep(0.1);
+        preference->setDecimals(2);
+        preferences->addPreference(preference);
+    }
     {
         auto getter = [myAvatar]()->int { return myAvatar->getControlScheme(); };
         auto setter = [myAvatar](int index) { myAvatar->setControlScheme(index); };

interface/src/ui/Stats.h

@@ -274,7 +274,7 @@ private: \
  *     of 2 if smaller than 128 pixels, or a multiple of 128 if greater than 128 pixels.
  *     <em>Read-only.</em>
  * @property {number} decimatedTextureCount - The number of textures that have been reduced in size because they were over the 
- *     maximum allowed dimensions of 4096 pixels on desktop or 2048 pixels on mobile.
+ *     maximum allowed dimensions of 8192 pixels on desktop or 2048 pixels on mobile.
  *     <em>Read-only.</em>
  * @property {number} gpuBuffers - The number of OpenGL buffer objects managed by the GPU back-end.
  *     <em>Read-only.</em>

interface/src/ui/overlays/ContextOverlayInterface.cpp

@@ -81,7 +81,8 @@ ContextOverlayInterface::ContextOverlayInterface() {
 
     auto nodeList = DependencyManager::get<NodeList>();
     auto& packetReceiver = nodeList->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::ChallengeOwnershipReply, this, "handleChallengeOwnershipReplyPacket");
+    packetReceiver.registerListener(PacketType::ChallengeOwnershipReply,
+        PacketReceiver::makeSourcedListenerReference<ContextOverlayInterface>(this, &ContextOverlayInterface::handleChallengeOwnershipReplyPacket));
     _challengeOwnershipTimeoutTimer.setSingleShot(true);
 }
 

interface/src/ui/overlays/Overlays.h

@@ -455,7 +455,7 @@ public slots:
      * @example <caption>Create an image overlay and report whether its image is loaded after 1s.</caption>
      * var overlay = Overlays.addOverlay("image", {
      *     bounds: { x: 100, y: 100, width: 200, height: 200 },
-     *     imageURL: "https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png"
+     *     imageURL: "https://content.vircadia.com/eu-c-1/vircadia-assets/interface/default/default_particle.png"
      * });
      * Script.setTimeout(function () {
      *     var isLoaded = Overlays.isLoaded(overlay);

libraries/audio-client/src/AudioClient.cpp

@@ -369,13 +369,20 @@ AudioClient::AudioClient() {
 
     auto nodeList = DependencyManager::get<NodeList>();
     auto& packetReceiver = nodeList->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::AudioStreamStats, &_stats, "processStreamStatsPacket");
-    packetReceiver.registerListener(PacketType::AudioEnvironment, this, "handleAudioEnvironmentDataPacket");
-    packetReceiver.registerListener(PacketType::SilentAudioFrame, this, "handleAudioDataPacket");
-    packetReceiver.registerListener(PacketType::MixedAudio, this, "handleAudioDataPacket");
-    packetReceiver.registerListener(PacketType::NoisyMute, this, "handleNoisyMutePacket");
-    packetReceiver.registerListener(PacketType::MuteEnvironment, this, "handleMuteEnvironmentPacket");
-    packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat");
+    packetReceiver.registerListener(PacketType::AudioStreamStats,
+        PacketReceiver::makeSourcedListenerReference<AudioIOStats>(&_stats, &AudioIOStats::processStreamStatsPacket));
+    packetReceiver.registerListener(PacketType::AudioEnvironment,
+        PacketReceiver::makeUnsourcedListenerReference<AudioClient>(this, &AudioClient::handleAudioEnvironmentDataPacket));
+    packetReceiver.registerListener(PacketType::SilentAudioFrame,
+        PacketReceiver::makeUnsourcedListenerReference<AudioClient>(this, &AudioClient::handleAudioDataPacket));
+    packetReceiver.registerListener(PacketType::MixedAudio,
+        PacketReceiver::makeUnsourcedListenerReference<AudioClient>(this, &AudioClient::handleAudioDataPacket));
+    packetReceiver.registerListener(PacketType::NoisyMute,
+        PacketReceiver::makeUnsourcedListenerReference<AudioClient>(this, &AudioClient::handleNoisyMutePacket));
+    packetReceiver.registerListener(PacketType::MuteEnvironment,
+        PacketReceiver::makeUnsourcedListenerReference<AudioClient>(this, &AudioClient::handleMuteEnvironmentPacket));
+    packetReceiver.registerListener(PacketType::SelectedAudioFormat,
+        PacketReceiver::makeUnsourcedListenerReference<AudioClient>(this, &AudioClient::handleSelectedAudioFormat));
 
     auto& domainHandler = nodeList->getDomainHandler();
     connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this] { 
@@ -2072,7 +2079,6 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
     // NOTE: device start() uses the Qt internal device list
     Lock lock(_deviceMutex);
 
-    Lock localAudioLock(_localAudioMutex);
     _localSamplesAvailable.exchange(0, std::memory_order_release);
 
     //wait on local injectors prep to finish running
@@ -2080,6 +2086,8 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
         _localPrepInjectorFuture.waitForFinished();
     }
 
+    Lock localAudioLock(_localAudioMutex);
+
     // cleanup any previously initialized device
     if (_audioOutput) {
         _audioOutputIODevice.close();

libraries/avatars/src/AvatarHashMap.cpp

@@ -123,10 +123,14 @@ AvatarHashMap::AvatarHashMap() {
     auto nodeList = DependencyManager::get<NodeList>();
 
     auto& packetReceiver = nodeList->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::BulkAvatarData, this, "processAvatarDataPacket");
-    packetReceiver.registerListener(PacketType::KillAvatar, this, "processKillAvatar");
-    packetReceiver.registerListener(PacketType::AvatarIdentity, this, "processAvatarIdentityPacket");
-    packetReceiver.registerListener(PacketType::BulkAvatarTraits, this, "processBulkAvatarTraits");
+    packetReceiver.registerListener(PacketType::BulkAvatarData,
+        PacketReceiver::makeSourcedListenerReference<AvatarHashMap>(this, &AvatarHashMap::processAvatarDataPacket));
+    packetReceiver.registerListener(PacketType::KillAvatar,
+        PacketReceiver::makeSourcedListenerReference<AvatarHashMap>(this, &AvatarHashMap::processKillAvatar));
+    packetReceiver.registerListener(PacketType::AvatarIdentity,
+        PacketReceiver::makeSourcedListenerReference<AvatarHashMap>(this, &AvatarHashMap::processAvatarIdentityPacket));
+    packetReceiver.registerListener(PacketType::BulkAvatarTraits,
+        PacketReceiver::makeSourcedListenerReference<AvatarHashMap>(this, &AvatarHashMap::processBulkAvatarTraits));
 
     connect(nodeList.data(), &NodeList::uuidChanged, this, &AvatarHashMap::sessionUUIDChanged);
 

libraries/avatars/src/ClientTraitsHandler.cpp

@@ -28,7 +28,8 @@ ClientTraitsHandler::ClientTraitsHandler(AvatarData* owningAvatar) :
         }
     });
 
-    nodeList->getPacketReceiver().registerListener(PacketType::SetAvatarTraits, this, "processTraitOverride");
+    nodeList->getPacketReceiver().registerListener(PacketType::SetAvatarTraits,
+        PacketReceiver::makeSourcedListenerReference<ClientTraitsHandler>(this, &ClientTraitsHandler::processTraitOverride));
 }
 
 void ClientTraitsHandler::markTraitUpdated(AvatarTraits::TraitType updatedTrait) {

libraries/display-plugins/CMakeLists.txt

@@ -13,6 +13,7 @@ include_hifi_library_headers(ktx)
 include_hifi_library_headers(render)
 include_hifi_library_headers(procedural)
 
+set(OpenGL_GL_PREFERENCE "LEGACY")
 target_opengl()
 
 GroupSources("src/display-plugins")

libraries/display-plugins/src/display-plugins/CompositorHelper.cpp

@@ -1,6 +1,7 @@
 //
 //  Created by Benjamin Arnold on 5/27/14.
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -213,7 +214,6 @@ void CompositorHelper::setAllowMouseCapture(bool capture) {
         _allowMouseCapture = capture;
         emit allowMouseCaptureChanged();
     }
-    _allowMouseCapture = capture;
 }
 
 void CompositorHelper::handleLeaveEvent() {

libraries/display-plugins/src/display-plugins/CompositorHelper.h

@@ -1,6 +1,7 @@
 //
 //  Created by Bradley Austin Davis Arnold on 2015/06/13
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html

libraries/entities-renderer/src/RenderableEntityItem.h

@@ -154,7 +154,6 @@ protected:
     std::mutex _materialsLock;
 
     quint64 _created;
-    QUuid _entityID;
 
     // The base class relies on comparing the model transform to the entity transform in order 
     // to trigger an update, so the member must not be visible to derived classes as a modifiable
@@ -164,6 +163,8 @@ protected:
     // i.e. to see if the rendering code needs to update because of a change in state of the 
     // entity.  This forces all the rendering code itself to be independent of the entity
     const EntityItemPointer _entity;
+
+    QUuid _entityID;
 };
 
 template <typename T>

libraries/entities-renderer/src/RenderableGizmoEntityItem.h

@@ -29,7 +29,7 @@ protected:
     bool isTransparent() const override;
 
 private:
-    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity);
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
     virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
     virtual void doRender(RenderArgs* args) override;
 

libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp

@@ -166,7 +166,7 @@ void ParticleEffectEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEn
         particleUniforms.rotateWithEntity = _particleProperties.rotateWithEntity ? 1 : 0;
     });
     // Update particle uniforms
-    memcpy(&_uniformBuffer.edit<ParticleUniforms>(), &particleUniforms, sizeof(ParticleUniforms));
+    _uniformBuffer.edit<ParticleUniforms>() = particleUniforms;
 }
 
 ItemKey ParticleEffectEntityRenderer::getKey() {

libraries/entities-renderer/src/RenderableWebEntityItem.cpp

@@ -1,6 +1,7 @@
 //
 //  Created by Bradley Austin Davis on 2015/05/12
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -35,6 +36,9 @@ using namespace render::entities;
 
 const QString WebEntityRenderer::QML = "Web3DSurface.qml";
 const char* WebEntityRenderer::URL_PROPERTY = "url";
+const char* WebEntityRenderer::SCRIPT_URL_PROPERTY = "scriptURL";
+const char* WebEntityRenderer::GLOBAL_POSITION_PROPERTY = "globalPosition";
+const char* WebEntityRenderer::USE_BACKGROUND_PROPERTY = "useBackground";
 
 std::function<void(QString, bool, QSharedPointer<OffscreenQmlSurface>&, bool&)> WebEntityRenderer::_acquireWebSurfaceOperator = nullptr;
 std::function<void(QSharedPointer<OffscreenQmlSurface>&, bool&, std::vector<QMetaObject::Connection>&)> WebEntityRenderer::_releaseWebSurfaceOperator = nullptr;
@@ -100,7 +104,7 @@ WebEntityRenderer::~WebEntityRenderer() {
 
 bool WebEntityRenderer::isTransparent() const {
     float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
-    return fadeRatio < OPAQUE_ALPHA_THRESHOLD || _alpha < 1.0f || _pulseProperties.getAlphaMode() != PulseMode::NONE;
+    return fadeRatio < OPAQUE_ALPHA_THRESHOLD || _alpha < 1.0f || _pulseProperties.getAlphaMode() != PulseMode::NONE || !_useBackground;
 }
 
 bool WebEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
@@ -193,11 +197,15 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
 
         if (_webSurface) {
             if (_webSurface->getRootItem()) {
-                if (_contentType == ContentType::HtmlContent && _sourceURL != newSourceURL) {
+                if (_contentType == ContentType::HtmlContent && _sourceURL != newSourceURL) {            
                     if (localSafeContext) {
                         ::hifi::scripting::setLocalAccessSafeThread(true);
                     }
                     _webSurface->getRootItem()->setProperty(URL_PROPERTY, newSourceURL);
+                    _webSurface->getRootItem()->setProperty(SCRIPT_URL_PROPERTY, _scriptURL);
+                    _webSurface->getRootItem()->setProperty(USE_BACKGROUND_PROPERTY, _useBackground);
+                    _webSurface->getSurfaceContext()->setContextProperty(GLOBAL_POSITION_PROPERTY, vec3toVariant(_contextPosition));
+                    _webSurface->setMaxFps((QUrl(newSourceURL).host().endsWith("youtube.com", Qt::CaseInsensitive)) ? YOUTUBE_MAX_FPS : _maxFPS);
                     ::hifi::scripting::setLocalAccessSafeThread(false);
                     _sourceURL = newSourceURL;
                 } else if (_contentType != ContentType::HtmlContent) {
@@ -207,7 +215,7 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
                 {
                     auto scriptURL = entity->getScriptURL();
                     if (_scriptURL != scriptURL) {
-                        _webSurface->getRootItem()->setProperty("scriptURL", _scriptURL);
+                        _webSurface->getRootItem()->setProperty(SCRIPT_URL_PROPERTY, scriptURL);
                         _scriptURL = scriptURL;
                     }
                 }
@@ -226,10 +234,18 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
                     }
                 }
 
+                { 
+                    auto useBackground = entity->getUseBackground();
+                    if (_useBackground != useBackground) {
+                        _webSurface->getRootItem()->setProperty(USE_BACKGROUND_PROPERTY, useBackground);
+                        _useBackground = useBackground;
+                    }
+                }
+
                 {
                     auto contextPosition = entity->getWorldPosition();
                     if (_contextPosition != contextPosition) {
-                        _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(contextPosition));
+                        _webSurface->getSurfaceContext()->setContextProperty(GLOBAL_POSITION_PROPERTY, vec3toVariant(contextPosition));
                         _contextPosition = contextPosition;
                     }
                 }
@@ -290,12 +306,14 @@ void WebEntityRenderer::doRender(RenderArgs* args) {
     glm::vec4 color;
     Transform transform;
     bool forward;
+    bool transparent;
     withReadLock([&] {
         float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
         color = glm::vec4(toGlm(_color), _alpha * fadeRatio);
         color = EntityRenderer::calculatePulseColor(color, _pulseProperties, _created);
         transform = _renderTransform;
         forward = _renderLayer != RenderLayer::WORLD || args->_renderMethod == render::Args::FORWARD;
+        transparent = isTransparent();
     });
 
     if (color.a == 0.0f) {
@@ -309,7 +327,7 @@ void WebEntityRenderer::doRender(RenderArgs* args) {
 
     // Turn off jitter for these entities
     batch.pushProjectionJitter();
-    DependencyManager::get<GeometryCache>()->bindWebBrowserProgram(batch, color.a < OPAQUE_ALPHA_THRESHOLD, forward);
+    DependencyManager::get<GeometryCache>()->bindWebBrowserProgram(batch, transparent, forward);
     DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, color, _geometryId);
     batch.popProjectionJitter();
     batch.setResourceTexture(0, nullptr);

libraries/entities-renderer/src/RenderableWebEntityItem.h

@@ -1,6 +1,7 @@
 //
 //  Created by Bradley Austin Davis on 2015/05/12
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -32,6 +33,9 @@ public:
 
     static const QString QML;
     static const char* URL_PROPERTY;
+    static const char* SCRIPT_URL_PROPERTY;
+    static const char* GLOBAL_POSITION_PROPERTY;
+    static const char* USE_BACKGROUND_PROPERTY;
 
     static void setAcquireWebSurfaceOperator(std::function<void(const QString&, bool, QSharedPointer<OffscreenQmlSurface>&, bool&)> acquireWebSurfaceOperator) { _acquireWebSurfaceOperator = acquireWebSurfaceOperator; }
     static void acquireWebSurface(const QString& url, bool htmlContent, QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface) {
@@ -93,6 +97,7 @@ private:
     uint16_t _dpi;
     QString _scriptURL;
     uint8_t _maxFPS;
+    bool _useBackground;
     WebInputMode _inputMode;
 
     glm::vec3 _contextPosition;

libraries/entities/src/EntityEditPacketSender.cpp

@@ -26,7 +26,8 @@
 
 EntityEditPacketSender::EntityEditPacketSender() {
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerDirectListener(PacketType::EntityEditNack, this, "processEntityEditNackPacket");
+    packetReceiver.registerDirectListener(PacketType::EntityEditNack,
+        PacketReceiver::makeSourcedListenerReference<EntityEditPacketSender>(this, &EntityEditPacketSender::processEntityEditNackPacket));
 }
 
 void EntityEditPacketSender::processEntityEditNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {

libraries/entities/src/EntityItemProperties.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 12/4/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -601,6 +602,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_MAX_FPS, maxFPS);
     CHECK_PROPERTY_CHANGE(PROP_INPUT_MODE, inputMode);
     CHECK_PROPERTY_CHANGE(PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT, showKeyboardFocusHighlight);
+    CHECK_PROPERTY_CHANGE(PROP_WEB_USE_BACKGROUND, useBackground);
 
     // Polyline
     CHECK_PROPERTY_CHANGE(PROP_LINE_POINTS, linePoints);
@@ -1040,7 +1042,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * @property {boolean} groupCulled=false - <code>true</code> if the mesh parts of the model are LOD culled as a group,
  *     <code>false</code> if separate mesh parts are LOD culled individually.
  *
- * @example <caption>Rez a Vive tracker puck.</caption>
+ * @example <caption>Rez a cowboy hat.</caption>
  * var entity = Entities.addEntity({
  *     type: "Model",
  *     position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -2 })),
@@ -1160,7 +1162,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  *     speedSpread: 0.01,
  *     emitAcceleration: { x: 0, y: 0.02, z: 0 },
  *     polarFinish: Math.PI,
- *     textures: "https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png",
+ *     textures: "https://content.vircadia.com/eu-c-1/vircadia-assets/interface/default/default_particle.png",
  *     particleRadius: 0.1,
  *     color: { red: 0, green: 255, blue: 0 },
  *     alphaFinish: 0,
@@ -1212,7 +1214,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  *     ],
  *     strokeWidths: [ 0.1, 0.1, 0.1 ],
  *     color: { red: 255, green: 0, blue: 0 },  // Use just the red channel from the image.
- *     textures: "http://hifi-production.s3.amazonaws.com/DomainContent/Toybox/flowArts/trails.png",
+ *     textures: "https://cdn-1.vircadia.com/us-e-1/DomainContent/Toybox/flowArts/trails.png",
  *     isUVModeStretch: true,
  *     lifetime: 300  // Delete after 5 minutes.
  * });
@@ -1382,6 +1384,9 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * @property {WebInputMode} inputMode="touch" - The user input mode to use.
  * @property {boolean} showKeyboardFocusHighlight=true - <code>true</code> if the entity is highlighted when it has keyboard
  *     focus, <code>false</code> if it isn't.
+ * @property {boolean} useBackground=true - <code>true</code> if the web entity should have a background,
+ *     <code>false</code> if the web entity's background should be transparent. The webpage must have CSS properties for transparency set
+ *     on the <code>background-color</code> for this property to have an effect.
  * @example <caption>Create a Web entity displaying at 1920 x 1080 resolution.</caption>
  * var METERS_TO_INCHES = 39.3701;
  * var entity = Entities.addEntity({
@@ -1819,6 +1824,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MAX_FPS, maxFPS);
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_INPUT_MODE, inputMode, getInputModeAsString());
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT, showKeyboardFocusHighlight);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_WEB_USE_BACKGROUND, useBackground);
     }
 
     // PolyVoxel only
@@ -2200,6 +2206,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(maxFPS, uint8_t, setMaxFPS);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(inputMode, InputMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(showKeyboardFocusHighlight, bool, setShowKeyboardFocusHighlight);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(useBackground, bool, setUseBackground);
 
     // Polyline
     COPY_PROPERTY_FROM_QSCRIPTVALUE(linePoints, qVectorVec3, setLinePoints);
@@ -2491,6 +2498,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(maxFPS);
     COPY_PROPERTY_IF_CHANGED(inputMode);
     COPY_PROPERTY_IF_CHANGED(showKeyboardFocusHighlight);
+    COPY_PROPERTY_IF_CHANGED(useBackground);
 
     // Polyline
     COPY_PROPERTY_IF_CHANGED(linePoints);
@@ -2890,6 +2898,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
         ADD_PROPERTY_TO_MAP(PROP_MAX_FPS, MaxFPS, maxFPS, uint8_t);
         ADD_PROPERTY_TO_MAP(PROP_INPUT_MODE, InputMode, inputMode, WebInputMode);
         ADD_PROPERTY_TO_MAP(PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT, ShowKeyboardFocusHighlight, showKeyboardFocusHighlight, bool);
+        ADD_PROPERTY_TO_MAP(PROP_WEB_USE_BACKGROUND, useBackground, useBackground, bool);
 
         // Polyline
         ADD_PROPERTY_TO_MAP(PROP_LINE_POINTS, LinePoints, linePoints, QVector<vec3>);
@@ -3320,6 +3329,7 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_MAX_FPS, properties.getMaxFPS());
                 APPEND_ENTITY_PROPERTY(PROP_INPUT_MODE, (uint32_t)properties.getInputMode());
                 APPEND_ENTITY_PROPERTY(PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT, properties.getShowKeyboardFocusHighlight());
+                APPEND_ENTITY_PROPERTY(PROP_WEB_USE_BACKGROUND, properties.getUseBackground());
             }
 
             if (properties.getType() == EntityTypes::Line) {
@@ -3795,6 +3805,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MAX_FPS, uint8_t, setMaxFPS);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_INPUT_MODE, WebInputMode, setInputMode);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT, bool, setShowKeyboardFocusHighlight);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_WEB_USE_BACKGROUND, bool, setUseBackground);
     }
 
     if (properties.getType() == EntityTypes::Line) {
@@ -4182,6 +4193,7 @@ void EntityItemProperties::markAllChanged() {
     _maxFPSChanged = true;
     _inputModeChanged = true;
     _showKeyboardFocusHighlightChanged = true;
+    _useBackgroundChanged = true;
 
     // Polyline
     _linePointsChanged = true;
@@ -4872,6 +4884,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (showKeyboardFocusHighlightChanged()) {
         out += "showKeyboardFocusHighlight";
     }
+    if (useBackgroundChanged()) {
+        out += "useBackground";
+    }
 
     // Shape
     if (shapeChanged()) {

libraries/entities/src/EntityItemProperties.h

@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 12/4/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -365,6 +366,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_MAX_FPS, MaxFPS, maxFPS, uint8_t, WebEntityItem::DEFAULT_MAX_FPS);
     DEFINE_PROPERTY_REF_ENUM(PROP_INPUT_MODE, InputMode, inputMode, WebInputMode, WebInputMode::TOUCH);
     DEFINE_PROPERTY_REF(PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT, ShowKeyboardFocusHighlight, showKeyboardFocusHighlight, bool, true);
+    DEFINE_PROPERTY_REF(PROP_WEB_USE_BACKGROUND, UseBackground, useBackground, bool, true);
 
     // Polyline
     DEFINE_PROPERTY_REF(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);

libraries/entities/src/EntityPropertyFlags.h

@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 12/4/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -317,6 +318,7 @@ enum EntityPropertyList {
     PROP_MAX_FPS = PROP_DERIVED_3,
     PROP_INPUT_MODE = PROP_DERIVED_4,
     PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT = PROP_DERIVED_5,
+    PROP_WEB_USE_BACKGROUND = PROP_DERIVED_6,
 
     // Polyline
     PROP_LINE_POINTS = PROP_DERIVED_0,

libraries/entities/src/EntityScriptServerLogClient.cpp

@@ -14,7 +14,8 @@
 EntityScriptServerLogClient::EntityScriptServerLogClient() {
     auto nodeList = DependencyManager::get<NodeList>();
     auto& packetReceiver = nodeList->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::EntityServerScriptLog, this, "handleEntityServerScriptLogPacket");
+    packetReceiver.registerListener(PacketType::EntityServerScriptLog,
+        PacketReceiver::makeSourcedListenerReference<EntityScriptServerLogClient>(this, &EntityScriptServerLogClient::handleEntityServerScriptLogPacket));
 
     QObject::connect(nodeList.data(), &NodeList::nodeActivated, this, &EntityScriptServerLogClient::nodeActivated);
     QObject::connect(nodeList.data(), &NodeList::nodeKilled, this, &EntityScriptServerLogClient::nodeKilled);