diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-13 13:31:46 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-13 13:31:46 +0200 |
| commit | 78a16b9334c9484d328f8800e801196eacf3900f (patch) | |
| tree | 4d6a9135122c4f019c51f86a6e24574d241b4d7c /indra | |
| parent | 3cc8a37489123433799f6e6ac650ee0a5406c831 (diff) | |
| parent | 9e11895c258d4dc7bc141804d8b7aa2762de4013 (diff) | |
merge
Diffstat (limited to 'indra')
| -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()) { |