From a6ccfb1685e75f77f6dfa3f39699cf44c83c6517 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 10 Mar 2016 15:03:25 -0800
Subject: [PATCH] CR

---
 interface/resources/qml/AssetServer.qml                |  2 +-
 .../src/scripting/AssetMappingsScriptingInterface.cpp  |  4 ++--
 .../src/scripting/AssetMappingsScriptingInterface.h    | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/AssetServer.qml
index 0490db2fa7..c4855b7704 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/AssetServer.qml
@@ -214,7 +214,7 @@ Window {
 
     property var uploadOpen: false;
     function uploadClicked() {
-        if(uploadOpen) {
+        if (uploadOpen) {
             return;
         }
         uploadOpen = true;
diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
index 9934b7937c..2839a0a9f6 100644
--- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp
+++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
@@ -91,8 +91,8 @@ void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping,
 
     // Check for override
     if (isKnownMapping(mapping)) {
-        auto message = "The following file already exists:\n" + path + "\nDo you want to override it?";
-        auto button = offscreenUi->messageBox(OffscreenUi::ICON_QUESTION, "", message,
+        auto message = path + "\n" + "This file already exists. Do you want to overwrite it?";
+        auto button = offscreenUi->messageBox(OffscreenUi::ICON_QUESTION, "Overwrite File", message,
                                               QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
         if (button == QMessageBox::No) {
             return;
diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.h b/interface/src/scripting/AssetMappingsScriptingInterface.h
index 2ad7da7c94..3a7711b340 100644
--- a/interface/src/scripting/AssetMappingsScriptingInterface.h
+++ b/interface/src/scripting/AssetMappingsScriptingInterface.h
@@ -59,13 +59,13 @@ public:
 
     Q_INVOKABLE QString getErrorString(int errorCode) const;
 
-    Q_INVOKABLE void setMapping(QString path, QString hash, QJSValue callback);
-    Q_INVOKABLE void getMapping(QString path, QJSValue callback);
+    Q_INVOKABLE void setMapping(QString path, QString hash, QJSValue callback = QJSValue());
+    Q_INVOKABLE void getMapping(QString path, QJSValue callback = QJSValue());
     Q_INVOKABLE void uploadFile(QString path, QString mapping, QJSValue callback = QJSValue());
     Q_INVOKABLE void deleteMappings(QStringList paths, QJSValue callback);
-    Q_INVOKABLE void deleteMapping(QString path, QJSValue callback) { deleteMappings(QStringList(path), callback); }
-    Q_INVOKABLE void getAllMappings(QJSValue callback);
-    Q_INVOKABLE void renameMapping(QString oldPath, QString newPath, QJSValue callback);
+    Q_INVOKABLE void deleteMapping(QString path, QJSValue callback) { deleteMappings(QStringList(path), callback = QJSValue()); }
+    Q_INVOKABLE void getAllMappings(QJSValue callback = QJSValue());
+    Q_INVOKABLE void renameMapping(QString oldPath, QString newPath, QJSValue callback = QJSValue());
 
 protected:
     QSet<AssetRequest*> _pendingRequests;