diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-15 13:59:05 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-15 13:59:05 -0700 |
| commit | 7b5006a21141e66d83c5d34676c3b20f63a69bfc (patch) | |
| tree | 66058223cd738fa2d249a08ec5e373e095035348 /indra/newview/llimfloatercontainer.h | |
| parent | 5a5df259ffc23a6289d25deac906047a7356fb42 (diff) | |
| parent | f609f4cca3a91c8d6ea7c55b61d0b2cfd29be6b7 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index c9da213f8c..6643471d97 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -136,8 +136,8 @@ private: // Conversation list implementation public: - void removeConversationListItem(const LLUUID& uuid, bool change_focus = true); - void addConversationListItem(const LLUUID& uuid); + bool removeConversationListItem(const LLUUID& uuid, bool change_focus = true); + void addConversationListItem(const LLUUID& uuid, bool isWidgetSelected = false); void setTimeNow(const LLUUID& session_id, const LLUUID& participant_id); void setNearbyDistances(); |