diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 12:21:53 -0800 |
| commit | b964f3bccaf744ec719e7dff132a77801a419f2b (patch) | |
| tree | f5f09ad1904cbf87878d5f6e9f34acbdb64975e2 /indra/newview/llspeakers.cpp | |
| parent | ce397569bf40b5fe6e80eb0e302bf47b709f3e54 (diff) | |
| parent | b3b608b2a8e0678a86c86f3506d6424d4834be20 (diff) | |
Merge from 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()) { |