Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into zzmp-fix/avatar-inputs-pos

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-05-20 07:44:29 -07:00
commit 472c735d60
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/entities/EntityServer.h
View file

@ -60,8 +60,8 @@ public:
virtual void trackViewerGone(const QUuid& sessionID) override; virtual void trackViewerGone(const QUuid& sessionID) override;
public slots: public slots:
virtual void nodeAdded(SharedNodePointer node); virtual void nodeAdded(SharedNodePointer node) override;
virtual void nodeKilled(SharedNodePointer node); virtual void nodeKilled(SharedNodePointer node) override;
void pruneDeletedEntities(); void pruneDeletedEntities();
protected: protected:

2
tests/controllers/src/main.cpp
View file

@ -89,7 +89,7 @@ public:
virtual GLWidget* getPrimaryWidget() override { return nullptr; } virtual GLWidget* getPrimaryWidget() override { return nullptr; }
virtual MainWindow* getPrimaryWindow() override { return nullptr; } virtual MainWindow* getPrimaryWindow() override { return nullptr; }
virtual QOpenGLContext* getPrimaryContext() override { return nullptr; } virtual QOpenGLContext* getPrimaryContext() override { return nullptr; }
virtual ui::Menu* getPrimaryMenu() { return nullptr; } virtual ui::Menu* getPrimaryMenu() override { return nullptr; }
virtual bool isForeground() override { return true; } virtual bool isForeground() override { return true; }
virtual const DisplayPluginPointer getActiveDisplayPlugin() const override { return DisplayPluginPointer(); } virtual const DisplayPluginPointer getActiveDisplayPlugin() const override { return DisplayPluginPointer(); }
}; };