summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-07 16:30:03 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-07 16:30:03 +0200
commit01447fb0d14ac34cea56c8ebd57b8f60e1535b76 (patch)
tree62d2cfd03662b6bed07c115d411271dbba207d26
parent4dc667b83f758e2834bee96d898f514b079ab478 (diff)
parent7c839098a7643f0e58dacdd9af1a509f2f72c61c (diff)
merge
--HG-- branch : product-engine
-rw-r--r--indra/newview/llavatarlistitem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index cb015a5461..aa1b7593f5 100644
--- 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