diff options
| author | Richard Linden <none@none> | 2012-05-25 12:04:12 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-05-25 12:04:12 -0700 |
| commit | 8a2b6f7d2e56625c59c3e40d4a23942a91b824a1 (patch) | |
| tree | 5d0259bbe43aa64134c90a200df4406d661b4c75 | |
| parent | d713925f435add08f6e48fec2472671fae58f170 (diff) | |
CHUI-131 FIX Crash when selecting Show on inventory offer notification if other notifications are being received
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 157821d554..a4a0198305 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -499,15 +499,16 @@ void LLScreenChannel::killToastByNotificationID(LLUUID id) void LLScreenChannel::removeToastByNotificationID(LLUUID id) { - std::vector<ToastElem>::iterator it = mToastList.begin(); + std::vector<ToastElem>::iterator it = find(mToastList.begin(), mToastList.end(), id); while( it != mToastList.end()) { - // find next toast with matching id - it = find(it, mToastList.end(), id); deleteToast(it->getToast()); mToastList.erase(it); redrawToasts(); + // find next toast with matching id + it = find(mToastList.begin(), mToastList.end(), id); } + it = find(mStoredToastList.begin(), mStoredToastList.end(), id); if (it != mStoredToastList.end()) { |