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

Merge branch 'nut' of github.com:samcake/hifi into nut

Browse source
This commit is contained in:
Sam Gateau 2019-05-30 12:03:58 -07:00
commit bb7a182544
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -428,7 +428,7 @@ void AvatarMixerClientData::resetSentTraitData(Node::LocalID nodeLocalID) {
_lastSentTraitsTimestamps[nodeLocalID] = TraitsCheckTimestamp();
_perNodeSentTraitVersions[nodeLocalID].reset();
_perNodeAckedTraitVersions[nodeLocalID].reset();
for (auto && pendingTraitVersions : _perNodePendingTraitVersions) {
for (auto&& pendingTraitVersions : _perNodePendingTraitVersions) {
pendingTraitVersions.second[nodeLocalID].reset();
}
}
@ -488,4 +488,8 @@ void AvatarMixerClientData::cleanupKilledNode(const QUuid&, Node::LocalID nodeLo
removeLastBroadcastTime(nodeLocalID);
_lastSentTraitsTimestamps.erase(nodeLocalID);
_perNodeSentTraitVersions.erase(nodeLocalID);
_perNodeAckedTraitVersions.erase(nodeLocalID);
for (auto&& pendingTraitVersions : _perNodePendingTraitVersions) {
pendingTraitVersions.second.erase(nodeLocalID);
}
}

7
interface/src/LocationBookmarks.cpp
View file

@ -59,7 +59,12 @@ void LocationBookmarks::setHomeLocation() {
}
void LocationBookmarks::setHomeLocationToAddress(const QVariant& address) {
Bookmarks::insert("Home", address);
Bookmarks::insert(HOME_BOOKMARK, address);
}
QString LocationBookmarks::getHomeLocationAddress() {
return addressForBookmark(HOME_BOOKMARK);
}
void LocationBookmarks::teleportToBookmark() {

6
interface/src/LocationBookmarks.h
View file

@ -47,6 +47,12 @@ public slots:
*/
void setHomeLocationToAddress(const QVariant& address);
/**jsdoc
* @function LocationBookmarksgetHomeLocationAddress
* @returns {string} The url for the home location bookmark
*/
QString getHomeLocationAddress();
protected:
void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override;