Merge pull request #3 from danteruiz/interstitalMerged

making requested changes and fixing compile issue for jenkins

interface/src/Application.cpp

@@ -3477,8 +3477,6 @@ void Application::setIsInterstitialMode(bool interstitialMode) {
 
         DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);
         DependencyManager::get<AvatarManager>()->setMyAvatarDataPacketsPaused(_interstitialMode);
-
-        emit interstitialModeChanged(_interstitialMode);
     }
 }
 
@@ -5321,7 +5319,6 @@ void Application::resetPhysicsReadyInformation() {
     _fullSceneCounterAtLastPhysicsCheck = 0;
     _nearbyEntitiesCountAtLastPhysicsCheck = 0;
     _nearbyEntitiesStabilityCount = 0;
-    _nearbyEntitiesReadyCount = 0;
     _physicsEnabled = false;
     _octreeProcessor.startEntitySequence();
 }
@@ -6590,7 +6587,6 @@ bool Application::nearbyEntitiesAreReadyForPhysics() {
                 readyNearbyEntities++;
             }
         }
-        _nearbyEntitiesReadyCount = readyNearbyEntities;
         return result;
     }
     return false;

interface/src/Application.h

@@ -225,9 +225,6 @@ public:
     bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); }
     void setPreferStylusOverLaser(bool value);
 
-    uint32_t getEntitiesStabilityCount() { return _nearbyEntitiesStabilityCount; }
-    uint32_t getNearbyEntitiesReadyCount() { return _nearbyEntitiesReadyCount; }
-    uint32_t getNearbyEntitiesCount() { return _nearbyEntitiesCountAtLastPhysicsCheck; }
     // FIXME: Remove setting completely or make available through JavaScript API?
     //bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); }
     bool getPreferAvatarFingerOverStylus() { return false; }
@@ -337,7 +334,6 @@ signals:
     void activeDisplayPluginChanged();
 
     void uploadRequest(QString path);
-    void interstitialModeChanged(bool interstitialMode);
 
 public slots:
     QVector<EntityItemID> pasteEntities(float x, float y, float z);
@@ -732,7 +728,6 @@ private:
     uint32_t _fullSceneCounterAtLastPhysicsCheck { 0 }; // _fullSceneReceivedCounter last time we checked physics ready
     uint32_t _nearbyEntitiesCountAtLastPhysicsCheck { 0 }; // how many in-range entities last time we checked physics ready
     uint32_t _nearbyEntitiesStabilityCount { 0 }; // how many times has _nearbyEntitiesCountAtLastPhysicsCheck been the same
-    uint32_t _nearbyEntitiesReadyCount { 0 };
     quint64 _lastPhysicsCheckTime { usecTimestampNow() }; // when did we last check to see if physics was ready
 
     bool _keyboardDeviceHasFocus { true };

interface/src/ConnectionMonitor.cpp

@@ -21,8 +21,8 @@
 
 // Because the connection monitor is created at startup, the time we wait on initial load
 // should be longer to allow the application to initialize.
-static const int ON_INITIAL_LOAD_DISPLAY_AFTER_DISCONNECTED_FOR_X_MS = 10000;
-static const int DISPLAY_AFTER_DISCONNECTED_FOR_X_MS = 5000;
+static const int ON_INITIAL_LOAD_REDIRECT_AFTER_DISCONNECTED_FOR_X_MS = 10000;
+static const int REDIRECT_AFTER_DISCONNECTED_FOR_X_MS = 5000;
 static const QString ERROR_DOMAIN_URL =  "file:///~/serverless/redirect.json";
 
 void ConnectionMonitor::init() {
@@ -36,17 +36,17 @@ void ConnectionMonitor::init() {
 
     _timer.setSingleShot(true);
     if (!domainHandler.isConnected()) {
-        _timer.start(ON_INITIAL_LOAD_DISPLAY_AFTER_DISCONNECTED_FOR_X_MS);
+        _timer.start(ON_INITIAL_LOAD_REDIRECT_AFTER_DISCONNECTED_FOR_X_MS);
     }
 
     connect(&_timer, &QTimer::timeout, this, []() {
-        qDebug() << "ConnectionMonitor: Showing connection failure window";
+        qDebug() << "ConnectionMonitor: Redirecting to 404 error domain";
         qApp->goToErrorDomainURL(REDIRECT_HIFI_ADDRESS);
     });
 }
 
 void ConnectionMonitor::startTimer() {
-    _timer.start(DISPLAY_AFTER_DISCONNECTED_FOR_X_MS);
+    _timer.start(REDIRECT_AFTER_DISCONNECTED_FOR_X_MS);
 }
 
 void ConnectionMonitor::stopTimer() {

interface/src/octree/SafeLanding.cpp

@@ -67,7 +67,7 @@ void SafeLanding::addTrackedEntity(const EntityItemID& entityID) {
         EntityItemPointer entity = _entityTree->findEntityByID(entityID);
 
         _trackedEntities.emplace(entityID, entity);
-        int trackedEntityCount = _trackedEntities.size();
+        int trackedEntityCount = (int)_trackedEntities.size();
 
         if (trackedEntityCount > _maxTrackedEntityCount) {
             _maxTrackedEntityCount = trackedEntityCount;

libraries/networking/src/AddressManager.cpp

@@ -152,12 +152,6 @@ void AddressManager::goForward() {
     }
 }
 
-void AddressManager::goToLastAddress() {
-    // this should always return something as long as the URL isn't empty.
-    handleUrl(_lastVisitedURL,
-        LookupTrigger::AttemptedRefresh);
-}
-
 void AddressManager::storeCurrentAddress() {
     auto url = currentAddress();
 

libraries/networking/src/AddressManager.h

@@ -255,7 +255,7 @@ public slots:
     * Go to the last address tried.  This will be the last URL tried from location.handleLookupString
     * @function location.goToLastAddress
     */
-    void goToLastAddress();
+    void goToLastAddress() { handleUrl(_lastVisitedURL, LookupTrigger::AttemptedRefresh); }
 
     /**jsdoc
      * Refresh the current address, e.g., after connecting to a domain in order to position the user to the desired location.