diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
commit | 663d8f7870c2858956aea8ab20129fd084a96dc8 (patch) | |
tree | 5ea7eaf40a018fbabaee165cc511998c5390f181 /indra/newview/llavatarlistitem.h | |
parent | ba057d34cdc8fb91093aadaaad22618b6371cd0f (diff) | |
parent | 8cb7af4f73c0a703b5842a708e94d80aea26b6db (diff) |
Merge
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); |