Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12867 from ctrlaltdavid/21836-a

Browse source 
Fix location.protocol value for serverless domains
This commit is contained in:
John Conklin II 2018-04-12 16:28:31 -07:00 committed by GitHub
commit 5322195eee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,10 @@ bool AddressManager::isConnected() {
return DependencyManager::get<NodeList>()->getDomainHandler().isConnected();
}
QString AddressManager::getProtocol() const {
return _domainURL.scheme();
}
QUrl AddressManager::currentAddress(bool domainOnly) const {
QUrl hifiURL = _domainURL;

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

@ -145,7 +145,7 @@ public:
};
bool isConnected();
const QString& getProtocol() { return URL_SCHEME_HIFI; };
QString getProtocol() const;
QUrl currentAddress(bool domainOnly = false) const;
QUrl currentFacingAddress() const;