summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarlistitem.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-01 12:52:21 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-01 12:52:21 -0500
commit27351b8bf59c3b2cfc31c27947397055a40b52d7 (patch)
tree6720e5dc77c8fee7f7fdecb46f220fb30247efb0 /indra/newview/llavatarlistitem.h
parentc361ee133761412acf766f6680b14e29e60f8a1e (diff)
parent677938e6531209ca9ccd29146454af67f1c743c7 (diff)
automated merge for viewer-2.0 -> avp.
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llavatarlistitem.h')
-rw-r--r--indra/newview/llavatarlistitem.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index 9d48101a44..341f5a6bcf 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -63,7 +63,7 @@ public:
void setOnline(bool online);
void setName(const std::string& name);
void setAvatarId(const LLUUID& id, bool ignore_status_changes = false);
- void setLastInteractionTime(const std::string& val);
+ void setLastInteractionTime(U32 secs_since);
//Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly
void setShowProfileBtn(bool show);
void setShowInfoBtn(bool show);
@@ -94,6 +94,8 @@ private:
void onNameCache(const std::string& first_name, const std::string& last_name);
+ std::string formatSeconds(U32 secs);
+
LLAvatarIconCtrl* mAvatarIcon;
LLTextBox* mAvatarName;
LLTextBox* mLastInteractionTime;