diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 14:00:03 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-11-13 14:00:03 +0200 |
| commit | 937c8c8595972947e901a580b656c45d0e5b27a0 (patch) | |
| tree | 317e1062385e07cd9a11bf18ed51ed0c620b43cf /indra/newview/llspeakers.cpp | |
| parent | 1db5d35447478a74ece447297289d76bfef8c48c (diff) | |
| parent | 9e11895c258d4dc7bc141804d8b7aa2762de4013 (diff) | |
merge
--HG--
branch : product-engine
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()) { |