diff options
author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:48:30 -0400 |
commit | df3e6b40fd80a139e745106231bc5c752271beea (patch) | |
tree | c52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/newview/llimview.h | |
parent | 8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/newview/llimview.h')
-rwxr-xr-x | indra/newview/llimview.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 1426bada95..f92eff4845 100755 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -138,6 +138,8 @@ public: bool mHasOfflineMessage; + bool mIsDNDsend; + private: void onAdHocNameCache(const LLAvatarName& av_name); @@ -441,6 +443,12 @@ public: bool isVoiceCall(const LLUUID& session_id); + void updateDNDMessageStatus(); + + bool isDNDMessageSend(const LLUUID& session_id); + + void setDNDMessageSent(const LLUUID& session_id, bool is_send); + void addNotifiedNonFriendSessionID(const LLUUID& session_id); bool isNonFriendSessionNotified(const LLUUID& session_id); |