diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-01-25 18:14:32 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-01-25 18:14:32 +0200 |
| commit | 5ed2790ff97232daf1cfe2ad5a70914486e4cb3d (patch) | |
| tree | fb0a07ba77bf49e2e0f87d72272cbe9cd1ac17bf /indra/newview | |
| parent | 6a6d8e174c45858cef7915c61a69601112d7f3e7 (diff) | |
MAINT-2375 FIXED World Map always shows first friend location after search for some users
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterworldmap.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 83f268818e..3c3b004d2c 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -549,10 +549,10 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string& getChild<LLUICtrl>("teleport_coordinate_z")->setValue(LLSD(200.f)); } // Don't re-request info if we already have it or we won't have it in time to teleport - if (mTrackedStatus != LLTracker::TRACKING_AVATAR || name != mTrackedAvatarName) + if (mTrackedStatus != LLTracker::TRACKING_AVATAR || avatar_id != mTrackedAvatarID) { mTrackedStatus = LLTracker::TRACKING_AVATAR; - mTrackedAvatarName = name; + mTrackedAvatarID = avatar_id; LLTracker::trackAvatar(avatar_id, name); } } diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index c5801c8819..fce945df6c 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -190,7 +190,7 @@ private: LLVector3d mTrackedLocation; LLTracker::ETrackingStatus mTrackedStatus; std::string mTrackedSimName; - std::string mTrackedAvatarName; + LLUUID mTrackedAvatarID; LLSLURL mSLURL; LLCtrlListInterface * mListFriendCombo; |