fixing merge conflicts

interface/src/Application.cpp

@@ -3492,10 +3492,6 @@ bool Application::isServerlessMode() const {
     return false;
 }
 
-bool Application::isInterstitialMode() const {
-    return _interstitialMode;
-}
-
 void Application::setIsInterstitialMode(bool interstitialMode) {
     if (_interstitialMode != interstitialMode) {
         _interstitialMode = interstitialMode;
@@ -6422,7 +6418,6 @@ void Application::clearDomainAvatars() {
 void Application::domainURLChanged(QUrl domainURL) {
     // disable physics until we have enough information about our new location to not cause craziness.
     resetPhysicsReadyInformation();
-    auto urlStr = domainURL.toString().toStdString();
     setIsServerlessMode(domainURL.scheme() != URL_SCHEME_HIFI);
     if (isServerlessMode()) {
         loadServerlessDomain(domainURL);
@@ -6433,7 +6428,6 @@ void Application::domainURLChanged(QUrl domainURL) {
 void Application::goToErrorDomainURL(QUrl errorDomainURL) {
     // disable physics until we have enough information about our new location to not cause craziness.
     resetPhysicsReadyInformation();
-    auto urlStr = errorDomainURL.toString().toStdString();
     setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_HIFI);
     if (isServerlessMode()) {
         loadServerlessDomain(errorDomainURL, true);

interface/src/Application.h

@@ -310,7 +310,7 @@ public:
     void saveNextPhysicsStats(QString filename);
 
     bool isServerlessMode() const;
-    bool isInterstitialMode() const;
+    bool isInterstitialMode() const { return _interstitialMode; }
 
     void replaceDomainContent(const QString& url);
 

interface/src/ConnectionMonitor.cpp

@@ -16,6 +16,7 @@
 
 #include <DependencyManager.h>
 #include <DomainHandler.h>
+#include <AddressManager.h>
 #include <NodeList.h>
 
 // Because the connection monitor is created at startup, the time we wait on initial load
@@ -40,7 +41,7 @@ void ConnectionMonitor::init() {
 
     connect(&_timer, &QTimer::timeout, this, []() {
         qDebug() << "ConnectionMonitor: Showing connection failure window";
-        qApp->goToErrorDomainURL(ERROR_DOMAIN_URL);
+        qApp->goToErrorDomainURL(REDIRECT_HIFI_ADDRESS);
     });
 }
 

interface/src/octree/OctreePacketProcessor.cpp

@@ -16,7 +16,6 @@
 #include "Application.h"
 #include "Menu.h"
 #include "SceneScriptingInterface.h"
-#include "SafeLanding.h"
 
 OctreePacketProcessor::OctreePacketProcessor():
     _safeLanding(new SafeLanding())
@@ -133,11 +132,3 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
 void OctreePacketProcessor::startEntitySequence() {
     _safeLanding->startEntitySequence(qApp->getEntities());
 }
-
-bool OctreePacketProcessor::isLoadSequenceComplete() const {
-    return _safeLanding->isLoadSequenceComplete();
-}
-
-float OctreePacketProcessor::domainLoadingProgress() {
-    return _safeLanding->loadingProgressPercentage();
-}

interface/src/octree/OctreePacketProcessor.h

@@ -15,7 +15,7 @@
 #include <ReceivedPacketProcessor.h>
 #include <ReceivedMessage.h>
 
-class SafeLanding;
+#include "SafeLanding.h"
 
 /// Handles processing of incoming voxel packets for the interface application. As with other ReceivedPacketProcessor classes
 /// the user is responsible for reading inbound packets and adding them to the processing queue by calling queueReceivedPacket()
@@ -26,8 +26,8 @@ public:
     ~OctreePacketProcessor();
 
     void startEntitySequence();
-    bool isLoadSequenceComplete() const;
+    bool isLoadSequenceComplete() const { return _safeLanding->isLoadSequenceComplete(); }
-    float domainLoadingProgress();
+    float domainLoadingProgress() { return _safeLanding->loadingProgressPercentage(); }
 
 signals:
     void packetVersionMismatch();

interface/src/octree/SafeLanding.cpp

@@ -113,8 +113,7 @@ bool SafeLanding::isLoadSequenceComplete() {
 float SafeLanding::loadingProgressPercentage() {
     Locker lock(_lock);
     if (_maxTrackedEntityCount > 0) {
-        int trackedEntityCount = _trackedEntities.size();
+        return ((_maxTrackedEntityCount - _trackedEntities.size()) / (float)_maxTrackedEntityCount);
-        return ((_maxTrackedEntityCount - trackedEntityCount) / (float)_maxTrackedEntityCount);
     }
 
     return 0.0f;

libraries/networking/src/AddressManager.cpp

@@ -48,8 +48,6 @@ QString AddressManager::getProtocol() const {
 QUrl AddressManager::currentAddress(bool domainOnly) const {
     QUrl hifiURL = _domainURL;
 
-    auto urlStr = hifiURL.toString().toStdString();
-
     if (!domainOnly && hifiURL.scheme() == URL_SCHEME_HIFI) {
         hifiURL.setPath(currentPath());
     }
@@ -156,8 +154,8 @@ void AddressManager::goForward() {
 
 void AddressManager::goToLastAddress() {
     // this should always return something as long as the URL isn't empty.
-    auto urlStr = _lastVisitedURL.toString().toStdString();
+    handleUrl(_lastVisitedURL,
-    handleUrl(_lastVisitedURL, LookupTrigger::AttemptedRefresh);
+        LookupTrigger::AttemptedRefresh);
 }
 
 void AddressManager::storeCurrentAddress() {

libraries/networking/src/AddressManager.h

@@ -149,7 +149,6 @@ public:
         UserInput,
         Back,
         Forward,
-        //Retry,
         StartupFromSettings,
         DomainPathResponse,
         Internal,