put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain

Seth Alves committed 8 years ago

Commit dcfebde1 parent d59a7211 file · +3 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+3−2

@@ -6275,8 +6275,9 @@ bool Application::canAcceptURL(const QString& urlString) const { · 6274 unmodified lines
6275	6275
6276	6276	bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
6277	6277	QUrl url(urlString);
6278		− if (isDomainURL(url)) {
6279		− // this is a URL for a domain, either hifi:// or serverless - have the AddressManager handle it
	6278	+
	6279	+ if (url.scheme() == URL_SCHEME_HIFI) {
	6280	+ // this is a hifi URL - have the AddressManager handle it
6280	6281	QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
6281	6282	Qt::AutoConnection, Q_ARG(const QString&, urlString));
6282	6283	return true;