History

Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash

Seth Alves committed 9 years ago

Commit 6b2caf82 parents 71deac4 18368cc62 files · +1391 −1303Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 62 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+1−1
@@ -510,7 +510,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS · 509 unmodified lines
510 510
511 if (root) {511 if (root) {
512 removeButtonsFromHomeScreen();512 removeButtonsFromHomeScreen();
513 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));513 QMetaObject::invokeMethod(root, "loadWebBase");
514 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));514 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
515 QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));515 QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
516 }516 }