Merge pull request #3404 from birarda/data-web-domain-lookup

initial transition to new metaverse API

Brad Hefta-Gaub committed 12 years ago

Commit b209b702 parents fc33de2 b0593bc31 files · +597 −610Browse files

Showing the changes to interface/src/ModelUploader.cpp (1 of 31 files). Show all

Unified · Split

@@ -421,11 +421,11 @@ void ModelUploader::uploadSuccess(const QJsonObject& jsonResponse) { · 420 unmodified lines
421	checkS3();	421	checkS3();
422	}	422	}
423		423
424	void ModelUploader::uploadFailed(QNetworkReply::NetworkError errorCode, const QString& errorString) {	424	void ModelUploader::uploadFailed(QNetworkReply& errorReply) {
425	if (_progressDialog) {	425	if (_progressDialog) {
426	_progressDialog->reject();	426	_progressDialog->reject();
427	}	427	}
428	qDebug() << "Model upload failed (" << errorCode << "): " << errorString;	428	qDebug() << "Model upload failed (" << errorReply.error() << "): " << errorReply.errorString();
429	QMessageBox::warning(NULL,	429	QMessageBox::warning(NULL,
430	QString("ModelUploader::uploadFailed()"),	430	QString("ModelUploader::uploadFailed()"),
431	QString("There was a problem with your upload, please try again later."),	431	QString("There was a problem with your upload, please try again later."),