Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 13:49:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into overlay-or-grab-not-both

Browse source
This commit is contained in:
Seth Alves 2016-05-19 09:48:50 -07:00
commit 6c3c9f45d1
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/ui/src/VrMenu.cpp
View file

@ -234,7 +234,5 @@ void VrMenu::removeAction(QAction* action) {
QObject* menu = item->parent(); QObject* menu = item->parent();
// Proxy QuickItem requests through the QML layer // Proxy QuickItem requests through the QML layer
QQuickMenuBase* qmlItem = reinterpret_cast<QQuickMenuBase*>(item); QQuickMenuBase* qmlItem = reinterpret_cast<QQuickMenuBase*>(item);
bool invokeResult = QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, Q_ARG(QQuickMenuBase*, qmlItem));
Q_ARG(QQuickMenuBase*, qmlItem));
Q_ASSERT(invokeResult);
} }

1
script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js
View file

@ -40,6 +40,7 @@ var DEFAULT_SOUND_DATA = {
Script.include("../../libraries/utils.js"); 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. 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 ignore() {}
function debug() { // Display the arguments not just [Object object]. function debug() { // Display the arguments not just [Object object].
//print.apply(null, [].map.call(arguments, JSON.stringify)); //print.apply(null, [].map.call(arguments, JSON.stringify));