Skip to content

Commit a2058bc

Browse files
committed
Hopefully fix Router's issue by caching ID for map compare, not name.
1 parent de96b8e commit a2058bc

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

indra/newview/llfloaterworldmap.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,10 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string&
593593
getChild<LLUICtrl>("spin z")->setValue(LLSD(200.f));
594594
}
595595
// Don't re-request info if we already have it or we won't have it in time to teleport
596-
if (mTrackedStatus != LLTracker::TRACKING_AVATAR || name != mTrackedAvatarName)
596+
if (mTrackedStatus != LLTracker::TRACKING_AVATAR || avatar_id != mTrackedAvatarID)
597597
{
598598
mTrackedStatus = LLTracker::TRACKING_AVATAR;
599-
mTrackedAvatarName = name;
600-
LLTracker::trackAvatar(avatar_id, name);
599+
LLTracker::trackAvatar(mTrackedAvatarID = avatar_id, name);
601600
}
602601
}
603602
else

indra/newview/llfloaterworldmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class LLFloaterWorldMap : public LLFloater
192192
LLVector3d mTrackedLocation;
193193
LLTracker::ETrackingStatus mTrackedStatus;
194194
std::string mTrackedSimName;
195-
std::string mTrackedAvatarName;
195+
LLUUID mTrackedAvatarID;
196196
LLSLURL mSLURL;
197197

198198
LLCtrlListInterface * mListFriendCombo;

0 commit comments

Comments
 (0)