aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateractivespeakers.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/llfloateractivespeakers.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/newview/llfloateractivespeakers.cpp')
-rw-r--r--linden/indra/newview/llfloateractivespeakers.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 4af21b6..1016e1e 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1010,7 +1010,7 @@ void LLSpeakerMgr::update(BOOL resort_ok)
1010 LLUUID speaker_id = speaker_it->first; 1010 LLUUID speaker_id = speaker_it->first;
1011 LLSpeaker* speakerp = speaker_it->second; 1011 LLSpeaker* speakerp = speaker_it->second;
1012 1012
1013 speaker_map_t::iterator cur_speaker_it = speaker_it++; 1013 speaker_it++;
1014 1014
1015 if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id)) 1015 if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
1016 { 1016 {