diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:23:13 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:23:13 +0100 |
| commit | 9f0f610682e0bcceb88eaddcb7a02acfcf3d05ce (patch) | |
| tree | 2df3177c49f39cc6bf5c72a3877eb13af7d64430 /indra/newview/llavatarlistitem.h | |
| parent | 10905a7ed1d650c63f596d0e4511494864b68cd3 (diff) | |
| parent | 6a298ea603258b6f72580379a1b25350c6e8b982 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llavatarlistitem.h')
| -rw-r--r-- | indra/newview/llavatarlistitem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index 2db6484a30..3ba2c7a3e3 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -100,7 +100,7 @@ public: void setName(const std::string& name); void setHighlight(const std::string& highlight); void setState(EItemState item_style); - void setAvatarId(const LLUUID& id, const LLUUID& session_id, bool ignore_status_changes = false); + void setAvatarId(const LLUUID& id, const LLUUID& session_id, bool ignore_status_changes = false, bool is_resident = true); void setLastInteractionTime(U32 secs_since); //Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly void setShowProfileBtn(bool show); |