Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:20:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'interstitalMerged' into interstitalMerged

Browse source
This commit is contained in:
Wayne Chen 2018-09-10 17:08:45 -07:00 committed by GitHub
commit a55849d24b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -6421,7 +6421,6 @@ void Application::clearDomainAvatars() {
void Application::domainURLChanged(QUrl domainURL) { void Application::domainURLChanged(QUrl domainURL) {
// disable physics until we have enough information about our new location to not cause craziness. // disable physics until we have enough information about our new location to not cause craziness.
resetPhysicsReadyInformation(); resetPhysicsReadyInformation();
auto urlStr = domainURL.toString().toStdString();
setIsServerlessMode(domainURL.scheme() != URL_SCHEME_HIFI); setIsServerlessMode(domainURL.scheme() != URL_SCHEME_HIFI);
if (isServerlessMode()) { if (isServerlessMode()) {
loadServerlessDomain(domainURL); loadServerlessDomain(domainURL);
@ -6432,7 +6431,6 @@ void Application::domainURLChanged(QUrl domainURL) {
void Application::goToErrorDomainURL(QUrl errorDomainURL) { void Application::goToErrorDomainURL(QUrl errorDomainURL) {
// disable physics until we have enough information about our new location to not cause craziness. // disable physics until we have enough information about our new location to not cause craziness.
resetPhysicsReadyInformation(); resetPhysicsReadyInformation();
auto urlStr = errorDomainURL.toString().toStdString();
setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_HIFI); setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_HIFI);
if (isServerlessMode()) { if (isServerlessMode()) {
loadServerlessDomain(errorDomainURL, true); loadServerlessDomain(errorDomainURL, true);

2
libraries/networking/src/AddressManager.cpp
View file

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