Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 14:01:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into run

Browse source
This commit is contained in:
Seth Alves 2018-01-11 13:21:45 -08:00
commit 1e92615459
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -106,7 +106,7 @@ Item {
if (isWebPage) {
var webUrl = tabletApps.get(currentApp).appWebUrl;
var scriptUrl = tabletApps.get(currentApp).scriptUrl;
loadSource("TabletWebView.qml");
loadSource("hifi/tablet/TabletWebView.qml");
loadWebUrl(webUrl, scriptUrl);
} else {
loader.load(tabletApps.get(currentApp).appUrl);

2
scripts/system/snapshot.js
View file

@ -121,7 +121,7 @@ function onMessage(message) {
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
} else {
tablet.loadQMLOnTop("TabletGeneralPreferences.qml");
tablet.loadQMLOnTop("hifi/tablet/TabletGeneralPreferences.qml");
}
break;
case 'captureStillAndGif':