diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-28 11:05:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-28 11:05:33 -0500 |
| commit | dc3823b62936961edad12aab605ce868ff5ce6ea (patch) | |
| tree | fe9eeaa176ab52f9b524db304dffe7a4a80085ca /indra/newview/llvoicechannel.h | |
| parent | 3ce756e44cca0cf6f9860871789e348647800e45 (diff) | |
| parent | 9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llvoicechannel.h')
| -rw-r--r-- | indra/newview/llvoicechannel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h index 7cef3c13d1..b8597ee5cb 100644 --- a/indra/newview/llvoicechannel.h +++ b/indra/newview/llvoicechannel.h @@ -191,6 +191,13 @@ protected: virtual void setState(EState state); private: + + /** + * Add the caller to the list of people with which we've recently interacted + * + **/ + void addToTheRecentPeopleList(); + std::string mSessionHandle; LLUUID mOtherUserID; BOOL mReceivedCall; |