From 85e203e2cbec798f0f74ca99ded0afb924be4f4b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 11 Mar 2016 11:44:46 -0800
Subject: [PATCH] return an empty string for no error

---
 libraries/networking/src/AssetUpload.cpp    | 5 +++--
 libraries/networking/src/MappingRequest.cpp | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/networking/src/AssetUpload.cpp b/libraries/networking/src/AssetUpload.cpp
index 44b7e9b681..f99f5badb6 100644
--- a/libraries/networking/src/AssetUpload.cpp
+++ b/libraries/networking/src/AssetUpload.cpp
@@ -34,6 +34,8 @@ AssetUpload::AssetUpload(const QString& filename) :
 QString AssetUpload::getErrorString() const {
     // figure out the right error message for error
     switch (_error) {
+        case AssetUpload::NoError:
+            return QString();
         case AssetUpload::PermissionDenied:
             return PERMISSION_DENIED_ERROR;
         case AssetUpload::TooLarge:
@@ -45,8 +47,7 @@ QString AssetUpload::getErrorString() const {
         case AssetUpload::ServerFileError:
             return "The Asset Server failed to store the asset. Please try again.";
         default:
-            // not handled, do not show a message box
-            return QString();
+            return QString("Unknown error with code %1").arg(_error);
     }
 }
 
diff --git a/libraries/networking/src/MappingRequest.cpp b/libraries/networking/src/MappingRequest.cpp
index be24c6b9d2..409957db42 100644
--- a/libraries/networking/src/MappingRequest.cpp
+++ b/libraries/networking/src/MappingRequest.cpp
@@ -28,7 +28,7 @@ void MappingRequest::start() {
 QString MappingRequest::getErrorString() const {
     switch (_error) {
         case MappingRequest::NoError:
-            return "No error";
+            return QString();
         case MappingRequest::NotFound:
             return "Asset not found";
         case MappingRequest::NetworkError:
@@ -42,7 +42,7 @@ QString MappingRequest::getErrorString() const {
         case MappingRequest::UnknownError:
             return "Asset Server internal error";
         default:
-            return QString();
+            return QString("Unknown error with code %1").arg(_error);
     }
 }