diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
| commit | 768ef450678a93496fb69012efaa15c915969c47 (patch) | |
| tree | 023ead1927667d4fb11cb56dceadc33694d35937 /indra/newview/llimview.h | |
| parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
| parent | 33007699cc701baf0c312ff669e659d874f3ae2f (diff) | |
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
Diffstat (limited to 'indra/newview/llimview.h')
| -rwxr-xr-x | indra/newview/llimview.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index f92eff4845..41a8813acb 100755 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -34,6 +34,9 @@ #include "lllogchat.h" #include "llvoicechannel.h" +#include "llcoros.h" +#include "lleventcoro.h" + class LLAvatarName; class LLFriendObserver; class LLCallDialogManager; @@ -292,6 +295,7 @@ private: * Add message to a list of message associated with session specified by session_id */ bool addToHistory(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text); + }; class LLIMSessionObserver |