diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-08 18:18:42 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-08 18:18:42 -0400 |
commit | 2711ba44f69afa3ed1df9fefc0b1403b40f0ec35 (patch) | |
tree | 7b3b6b06fba9e82f282558bc7603e65a7faa08b9 /indra/newview/llspeakers.cpp | |
parent | 4bbcd26941c3be6b83214d0dc45c70f99e474dda (diff) | |
parent | a2a25c9ed5de12cfb8a08844682368dc236a1b42 (diff) |
merge
Diffstat (limited to 'indra/newview/llspeakers.cpp')
-rw-r--r-- | indra/newview/llspeakers.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 3c3c699d17..bf209df863 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -855,10 +855,7 @@ void LLIMSpeakerMgr::updateSpeakers(const LLSD& update) } } } -/*prep# - virtual void httpFailure() - llwarns << dumpResponse() << llendl; - */ + void LLIMSpeakerMgr::toggleAllowTextChat(const LLUUID& speaker_id) { LLPointer<LLSpeaker> speakerp = findSpeaker(speaker_id); |