Showing the changes to interface/src/Application.cpp (1 of 77 files). Show all
Unified · Split
| @@ -2645,7 +2645,7 @@ QString Application::getUserAgent() { · 2644 unmodified lines | |||
| 2645 | return userAgent; | 2645 | return userAgent; |
| 2646 | } | 2646 | } |
| 2647 | 2647 | ||
| 2648 | QString userAgent = NetworkingConstants::VIRCADIA_USER_AGENT + "/" + BuildInfo::VERSION + "; " | 2648 | QString userAgent = NetworkingConstants::OVERTE_USER_AGENT + "/" + BuildInfo::VERSION + "; " |
| 2649 | + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")"; | 2649 | + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")"; |
| 2650 | 2650 | ||
| 2651 | auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-"); }; | 2651 | auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-"); }; |
| @@ -3983,7 +3983,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 1331 unmodified lines | |||
| 3983 | 3983 | ||
| 3984 | // when --url in command line, teleport to location | 3984 | // when --url in command line, teleport to location |
| 3985 | if (!_urlParam.isEmpty()) { // Not sure if format supported by isValid(). | 3985 | if (!_urlParam.isEmpty()) { // Not sure if format supported by isValid(). |
| 3986 | if (_urlParam.scheme() == URL_SCHEME_VIRCADIAAPP) { | 3986 | if (_urlParam.scheme() == URL_SCHEME_OVERTEAPP) { |
| 3987 | Setting::Handle<QVariant>("startUpApp").set(_urlParam.path()); | 3987 | Setting::Handle<QVariant>("startUpApp").set(_urlParam.path()); |
| 3988 | } else { | 3988 | } else { |
| 3989 | addressLookupString = _urlParam.toString(); | 3989 | addressLookupString = _urlParam.toString(); |
| @@ -3998,7 +3998,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { · 8 unmodified lines | |||
| 3998 | // If this is a first run we short-circuit the address passed in | 3998 | // If this is a first run we short-circuit the address passed in |
| 3999 | if (_firstRun.get()) { | 3999 | if (_firstRun.get()) { |
| 4000 | if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) { | 4000 | if (!BuildInfo::PRELOADED_STARTUP_LOCATION.isEmpty()) { |
| 4001 | DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS); | 4001 | DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(NetworkingConstants::DEFAULT_OVERTE_ADDRESS); |
| 4002 | Menu::getInstance()->triggerOption(MenuOption::HomeLocation); | 4002 | Menu::getInstance()->triggerOption(MenuOption::HomeLocation); |
| 4003 | } | 4003 | } |
| 4004 | 4004 | ||
| @@ -7268,7 +7268,7 @@ void Application::clearDomainOctreeDetails(bool clearAll) { · 3263 unmodified lines | |||
| 7268 | 7268 | ||
| 7269 | void Application::domainURLChanged(QUrl domainURL) { | 7269 | void Application::domainURLChanged(QUrl domainURL) { |
| 7270 | // disable physics until we have enough information about our new location to not cause craziness. | 7270 | // disable physics until we have enough information about our new location to not cause craziness. |
| 7271 | setIsServerlessMode(domainURL.scheme() != URL_SCHEME_VIRCADIA); | 7271 | setIsServerlessMode(domainURL.scheme() != URL_SCHEME_OVERTE); |
| 7272 | if (isServerlessMode()) { | 7272 | if (isServerlessMode()) { |
| 7273 | loadServerlessDomain(domainURL); | 7273 | loadServerlessDomain(domainURL); |
| 7274 | } | 7274 | } |
| @@ -7277,7 +7277,7 @@ void Application::domainURLChanged(QUrl domainURL) { · 2 unmodified lines | |||
| 7277 | 7277 | ||
| 7278 | void Application::goToErrorDomainURL(QUrl errorDomainURL) { | 7278 | void Application::goToErrorDomainURL(QUrl errorDomainURL) { |
| 7279 | // disable physics until we have enough information about our new location to not cause craziness. | 7279 | // disable physics until we have enough information about our new location to not cause craziness. |
| 7280 | setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_VIRCADIA); | 7280 | setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_OVERTE); |
| 7281 | if (isServerlessMode()) { | 7281 | if (isServerlessMode()) { |
| 7282 | loadErrorDomain(errorDomainURL); | 7282 | loadErrorDomain(errorDomainURL); |
| 7283 | } | 7283 | } |
| @@ -7641,7 +7641,7 @@ bool Application::canAcceptURL(const QString& urlString) const { · 357 unmodified lines | |||
| 7641 | QUrl url(urlString); | 7641 | QUrl url(urlString); |
| 7642 | if (url.query().contains(WEB_VIEW_TAG)) { | 7642 | if (url.query().contains(WEB_VIEW_TAG)) { |
| 7643 | return false; | 7643 | return false; |
| 7644 | } else if (urlString.startsWith(URL_SCHEME_VIRCADIA)) { | 7644 | } else if (urlString.startsWith(URL_SCHEME_OVERTE)) { |
| 7645 | return true; | 7645 | return true; |
| 7646 | } | 7646 | } |
| 7647 | QString lowerPath = url.path().toLower(); | 7647 | QString lowerPath = url.path().toLower(); |
| @@ -7656,7 +7656,7 @@ bool Application::canAcceptURL(const QString& urlString) const { · 8 unmodified lines | |||
| 7656 | bool Application::acceptURL(const QString& urlString, bool defaultUpload) { | 7656 | bool Application::acceptURL(const QString& urlString, bool defaultUpload) { |
| 7657 | QUrl url(urlString); | 7657 | QUrl url(urlString); |
| 7658 | 7658 | ||
| 7659 | if (url.scheme() == URL_SCHEME_VIRCADIA) { | 7659 | if (url.scheme() == URL_SCHEME_OVERTE) { |
| 7660 | // this is a hifi URL - have the AddressManager handle it | 7660 | // this is a hifi URL - have the AddressManager handle it |
| 7661 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", | 7661 | QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString", |
| 7662 | Qt::AutoConnection, Q_ARG(const QString&, urlString)); | 7662 | Qt::AutoConnection, Q_ARG(const QString&, urlString)); |
| @@ -7787,7 +7787,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) { · 124 unmodified lines | |||
| 7787 | QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); | 7787 | QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); |
| 7788 | QNetworkRequest networkRequest = QNetworkRequest(url); | 7788 | QNetworkRequest networkRequest = QNetworkRequest(url); |
| 7789 | networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); | 7789 | networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); |
| 7790 | networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::VIRCADIA_USER_AGENT); | 7790 | networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT); |
| 7791 | QNetworkReply* reply = networkAccessManager.get(networkRequest); | 7791 | QNetworkReply* reply = networkAccessManager.get(networkRequest); |
| 7792 | int requestNumber = ++_avatarAttachmentRequest; | 7792 | int requestNumber = ++_avatarAttachmentRequest; |
| 7793 | connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() { | 7793 | connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() { |