diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llfloateractivespeakers.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llfloateractivespeakers.cpp')
| -rw-r--r-- | linden/indra/newview/llfloateractivespeakers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp index 75cf176..c1ba5da 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 | { |