Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 20:50:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16028 from zfox23/shieldIcon_master

Browse source 
RC84: Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
This commit is contained in:
Zach Fox 2019-08-05 13:36:58 -07:00 committed by GitHub
commit 26e0a5dfd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/ui/AvatarInputs.cpp
View file

@ -32,6 +32,7 @@ AvatarInputs* AvatarInputs::getInstance() {
AvatarInputs::AvatarInputs(QObject* parent) : QObject(parent) {
_showAudioTools = showAudioToolsSetting.get();
_showBubbleTools = showBubbleToolsSetting.get();
auto nodeList = DependencyManager::get<NodeList>();
auto usersScriptingInterface = DependencyManager::get<UsersScriptingInterface>();
connect(nodeList.data(), &NodeList::ignoreRadiusEnabledChanged, this, &AvatarInputs::ignoreRadiusEnabledChanged);

4
interface/src/ui/AvatarInputs.h
View file

@ -194,8 +194,8 @@ private:
void onAvatarEnteredIgnoreRadius();
void onAvatarLeftIgnoreRadius();
float _trailingAudioLoudness{ 0 };
bool _showAudioTools { false };
bool _showBubbleTools{ false };
bool _showAudioTools { true };
bool _showBubbleTools{ true };
};
#endif // hifi_AvatarInputs_h