merge

--HG-- branch : product-engine
2009-12-07 16:30:03 +02:00 · 2009-12-07 16:30:03 +02:00 · 01447fb0d1
parent 4dc667b83f 7c839098a7
commit 01447fb0d1
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@ -72,7 +72,7 @@ public:

 	void setOnline(bool online);
 	void setName(const std::string& name);
-	void setHighlight(const std::string& highlight); // XXX ugly name
+	void setHighlight(const std::string& highlight);
 	void setAvatarId(const LLUUID& id, bool ignore_status_changes = false);
 	void setLastInteractionTime(U32 secs_since);
 	//Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly