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/llspeakers.h | |
parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
parent | 33007699cc701baf0c312ff669e659d874f3ae2f (diff) |
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
Diffstat (limited to 'indra/newview/llspeakers.h')
-rwxr-xr-x | indra/newview/llspeakers.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h index 0e69184125..5cff70f377 100755 --- a/indra/newview/llspeakers.h +++ b/indra/newview/llspeakers.h @@ -30,6 +30,8 @@ #include "llevent.h" #include "lleventtimer.h" #include "llvoicechannel.h" +#include "lleventcoro.h" +#include "llcoros.h" class LLSpeakerMgr; @@ -333,6 +335,8 @@ protected: */ void forceVoiceModeratedMode(bool should_be_muted); + void moderationActionCoro(std::string url, LLSD action); + }; class LLActiveSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLActiveSpeakerMgr> |