From ee31e3b8969c9b49eddff051283d1ac754b5ac57 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 12 Oct 2016 20:08:15 +1300
Subject: [PATCH 1/3] Fix Asset Browser add-to-world with spaces unwittingly
 appended to names

---
 interface/resources/qml/AssetServer.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/AssetServer.qml
index 050bc8e99e..ec866a6f0e 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/AssetServer.qml
@@ -184,7 +184,7 @@ ScrollingWindow {
         prompt.selected.connect(function (jsonResult) {
             if (jsonResult) {
                 var result = JSON.parse(jsonResult);
-                var url = result.textInput;
+                var url = result.textInput.trim();
                 var shapeType;
                 switch (result.comboBox) {
                     case SHAPE_TYPE_SIMPLE_HULL:

From 86f6cee2ad4139015ff0bdccea2e8db629111701 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 12 Oct 2016 20:08:33 +1300
Subject: [PATCH 2/3] Fix Asset Browser add-to-world drop-down

---
 interface/resources/qml/controls-uit/ComboBox.qml     | 3 +++
 interface/resources/qml/dialogs/CustomQueryDialog.qml | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml
index fa100a965f..573fed4ef9 100644
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controls-uit/ComboBox.qml
@@ -32,6 +32,8 @@ FocusScope {
 
     readonly property ComboBox control: comboBox
 
+    signal accepted();
+
     implicitHeight: comboBox.height;
     focus: true
 
@@ -134,6 +136,7 @@ FocusScope {
     function hideList() {
         popup.visible = false;
         scrollView.hoverEnabled = false;
+        root.accepted();
     }
 
     FocusScope {
diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml
index 563dfc3099..96acc33069 100644
--- a/interface/resources/qml/dialogs/CustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml
@@ -224,7 +224,10 @@ ModalWindow {
                     bottom: parent.bottom;
                 }
                 model: root.comboBox ? root.comboBox.items : [];
-                onCurrentTextChanged: updateCheckbox();
+                onAccepted: {
+                    updateCheckbox();
+                    focus = true;
+                }
             }
         }
 

From 18f19b07d4338430d728ad4944284b0016af76f4 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 13 Oct 2016 08:37:30 +1300
Subject: [PATCH 3/3] Fix checkbox not being disabled per dropdown default

And tweak checkbox position.
---
 interface/resources/qml/dialogs/CustomQueryDialog.qml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml
index 96acc33069..76d20f0e0a 100644
--- a/interface/resources/qml/dialogs/CustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml
@@ -211,6 +211,7 @@ ModalWindow {
                     left: parent.left;
                     bottom: parent.bottom;
                     leftMargin: 6;  // Magic number to align with warning icon
+                    bottomMargin: 6;
                 }
             }
 
@@ -339,6 +340,7 @@ ModalWindow {
 
     Component.onCompleted: {
         updateIcon();
+        updateCheckbox();
         d.resize();
         textField.forceActiveFocus();
     }