Hopefully fix Router's issue by caching ID for map compare, not name.

singularity-viewer · Feb 13, 2015 · a2058bc · a2058bc
1 parent de96b8e
commit a2058bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
@@ -593,11 +593,10 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string&
 			getChild<LLUICtrl>("spin 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;
-			LLTracker::trackAvatar(avatar_id, name);
+			LLTracker::trackAvatar(mTrackedAvatarID = avatar_id, name);
 		}
 	}
 	else

diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
@@ -192,7 +192,7 @@ class LLFloaterWorldMap : public LLFloater
 	LLVector3d				mTrackedLocation;
 	LLTracker::ETrackingStatus mTrackedStatus;
 	std::string				mTrackedSimName;
-	std::string				mTrackedAvatarName;
+	LLUUID					mTrackedAvatarID;
 	LLSLURL				mSLURL;
 
 	LLCtrlListInterface *	mListFriendCombo;