diff options
| author | simon <none@none> | 2014-06-17 10:40:42 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-06-17 10:40:42 -0700 |
| commit | 592024b5805a116c9d0bef893127427df0741b41 (patch) | |
| tree | bcadc0685873b40e23254cf3d6232e8f1f3f0e1b /indra/newview/llspeakers.cpp | |
| parent | 9e855b03b7f285794520eaf781b6a963b6cd51d9 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge viewer-release and become version 3.7.9
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rwxr-xr-x | indra/newview/llspeakers.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index f25076d47e..89302c3c64 100755 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -270,21 +270,23 @@ bool LLSpeakersDelayActionsStorage::isTimerStarted(const LLUUID& speaker_id) class ModerationResponder : public LLHTTPClient::Responder { + LOG_CLASS(ModerationResponder); public: ModerationResponder(const LLUUID& session_id) { mSessionID = session_id; } - virtual void error(U32 status, const std::string& reason) +protected: + virtual void httpFailure() { - LL_WARNS() << status << ": " << reason << LL_ENDL; + LL_WARNS() << dumpResponse() << LL_ENDL; if ( gIMMgr ) { //403 == you're not a mod //should be disabled if you're not a moderator - if ( 403 == status ) + if ( HTTP_FORBIDDEN == getStatus() ) { gIMMgr->showSessionEventError( "mute", @@ -855,10 +857,7 @@ void LLIMSpeakerMgr::updateSpeakers(const LLSD& update) } } } -/*prep# - virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content) - LL_WARNS() << "ModerationResponder error [status:" << status << "]: " << content << LL_ENDL; - */ + void LLIMSpeakerMgr::toggleAllowTextChat(const LLUUID& speaker_id) { LLPointer<LLSpeaker> speakerp = findSpeaker(speaker_id); |