From 3c12ae892545e568606eecd62ac5ee4cc52f4abc Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Mon, 22 Jan 2018 20:52:18 -0700 Subject: [PATCH 1/2] Fix Edit/Asset Browser in HMD mode --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ffe2f781db..5854501809 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6195,7 +6195,7 @@ void Application::showAssetServerWidget(QString filePath) { if (!hmd->getShouldShowTablet() && !isHMDMode()) { DependencyManager::get()->show(url, "AssetServer", startUpload); } else { - static const QUrl url("../dialogs/TabletAssetServer.qml"); + static const QUrl url("hifi/dialogs/TabletAssetServer.qml"); tablet->pushOntoStack(url); } } From fddbf13796376c989f7f4c980a690140b207c8c7 Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Tue, 23 Jan 2018 11:12:22 -0700 Subject: [PATCH 2/2] Fix Asset Browser access from Create --- interface/resources/qml/hifi/tablet/Edit.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/tablet/Edit.qml b/interface/resources/qml/hifi/tablet/Edit.qml index e2e8c4362e..efd797e12d 100644 --- a/interface/resources/qml/hifi/tablet/Edit.qml +++ b/interface/resources/qml/hifi/tablet/Edit.qml @@ -12,7 +12,7 @@ StackView { HifiConstants { id: hifi } function pushSource(path) { - editRoot.push(Qt.resolvedUrl(path)); + editRoot.push(Qt.resolvedUrl("../../" + path)); editRoot.currentItem.sendToScript.connect(editRoot.sendToScript); }