Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-23 04:51:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:highfidelity/hifi into one

Browse source
This commit is contained in:
sam gateau 2018-11-16 11:55:44 -08:00
commit 9dd6c8d9d9
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/dialogs/security/Security.qml
View file

@ -256,7 +256,7 @@ Rectangle {
color: hifi.colors.baseGrayHighlight;
HifiStylesUit.RalewaySemiBold {
text: "Wallet";
text: "Secure Transactions";
anchors.fill: parent;
anchors.leftMargin: 20;
color: hifi.colors.white;
@ -287,7 +287,7 @@ Rectangle {
HifiStylesUit.RalewaySemiBold {
id: securityPictureText;
text: "Wallet Security Picture";
text: "Security Picture";
// Anchors
anchors.top: parent.top;
anchors.bottom: parent.bottom;

5
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -954,11 +954,6 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
const QUuid myNodeID = nodeList->getSessionUUID();
if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
// don't delete other avatar's avatarEntities
// If you actually own the entity but the onwership property is not set because of a domain switch
// The lines below makes sure the entity is deleted once its properties are set.
auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
AvatarSharedPointer myAvatar = avatarHashMap->getAvatarBySessionID(myNodeID);
myAvatar->insertDetachedEntityID(id);
shouldSendDeleteToServer = false;
return;
}