From 2c9b0f7233f00938addc2031b84972f865a30d64 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 18 May 2016 17:31:47 -0700 Subject: [PATCH 1/3] Rm failing VrMenu assertion --- libraries/ui/src/VrMenu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp index 2d6113ad63..a0a1399c78 100644 --- a/libraries/ui/src/VrMenu.cpp +++ b/libraries/ui/src/VrMenu.cpp @@ -236,5 +236,4 @@ void VrMenu::removeAction(QAction* action) { QQuickMenuBase* qmlItem = reinterpret_cast(item); bool invokeResult = QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, Q_ARG(QQuickMenuBase*, qmlItem)); - Q_ASSERT(invokeResult); } From 87b102ae0f0c1ebc7e2b771fd9f1b899271b0f99 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 18 May 2016 18:19:44 -0700 Subject: [PATCH 2/3] Fix -Wunused-result from invokeResult --- libraries/ui/src/VrMenu.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp index a0a1399c78..c2732197d3 100644 --- a/libraries/ui/src/VrMenu.cpp +++ b/libraries/ui/src/VrMenu.cpp @@ -234,6 +234,5 @@ void VrMenu::removeAction(QAction* action) { QObject* menu = item->parent(); // Proxy QuickItem requests through the QML layer QQuickMenuBase* qmlItem = reinterpret_cast(item); - bool invokeResult = QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, - Q_ARG(QQuickMenuBase*, qmlItem)); + QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, Q_ARG(QQuickMenuBase*, qmlItem)); } From 917fe2ae6a0154ac16a1b3b8fcd6d5ea947218f0 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 18 May 2016 19:09:25 -0700 Subject: [PATCH 3/3] Give AC audio searcher invalid avatar URL --- .../audioExamples/acAudioSearching/ACAudioSearchAndInject.js | 1 + 1 file changed, 1 insertion(+) diff --git a/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js b/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js index de7baba267..381a7ee902 100644 --- a/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js +++ b/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js @@ -40,6 +40,7 @@ var DEFAULT_SOUND_DATA = { Script.include("../../libraries/utils.js"); Agent.isAvatar = true; // This puts a robot at 0,0,0, but is currently necessary in order to use AvatarList. +Avatar.skeletonModelURL = "http://invalid-url"; function ignore() {} function debug() { // Display the arguments not just [Object object]. //print.apply(null, [].map.call(arguments, JSON.stringify));