diff options
| author | richard <none@none> | 2009-11-13 18:28:20 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-13 18:28:20 -0800 |
| commit | 4c4f329acb7792e4713b7e38bd437b9a7d239ec5 (patch) | |
| tree | cf15c27f8e66a3dfc95644a8673dead729e040d8 /indra/newview/llspeakers.cpp | |
| parent | 890da1d3914ffb52d0899c333fe8b8c280fe4d34 (diff) | |
| parent | f4fdaa8ee9d8016ca23957e78fe246206579723f (diff) | |
merge
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 2ed82b7d62..261bdbcfc0 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -359,6 +359,9 @@ void LLSpeakerMgr::updateSpeakerList() LLPointer<LLSpeaker> LLSpeakerMgr::findSpeaker(const LLUUID& speaker_id) { + //In some conditions map causes crash if it is empty(Windows only), adding check (EK) + if (mSpeakers.size() == 0) + return NULL; speaker_map_t::iterator found_it = mSpeakers.find(speaker_id); if (found_it == mSpeakers.end()) { |