From 344410ea79fc60cbc312e341f2a61844f4f09f1b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 29 May 2019 15:13:47 -0700 Subject: [PATCH 1/2] Add getHomeLocationAddress to bookmark API --- interface/src/LocationBookmarks.cpp | 7 ++++++- interface/src/LocationBookmarks.h | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp index 8415c84282..b2e31c3021 100644 --- a/interface/src/LocationBookmarks.cpp +++ b/interface/src/LocationBookmarks.cpp @@ -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() { diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h index 8cd8e40634..f9de19c626 100644 --- a/interface/src/LocationBookmarks.h +++ b/interface/src/LocationBookmarks.h @@ -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; From 0f38001d2864802ab83f6cf334bc85edbd112195 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 29 May 2019 16:34:13 -0700 Subject: [PATCH 2/2] Clear traits ack data on node disconnect --- assignment-client/src/avatars/AvatarMixerClientData.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index 361f87a635..8c4ceb2288 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -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); + } }