diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-14 18:54:06 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-14 18:54:06 +0300 |
| commit | 6a298ea603258b6f72580379a1b25350c6e8b982 (patch) | |
| tree | 1125aa8c1d34ba7a9f2292219bdbe73f15b702c0 | |
| parent | 7a65a9430e1904f9c9b23d6f75a567e76a962312 (diff) | |
Fixed major bug EXT-6802 (Cancelling out of People Chooser while Searching Causes Crash)
* Added check of Avatar Picker floater (People Chooser) against NULL in search callback.
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/236/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 01a699506e..d1e99fbd61 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -451,8 +451,8 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void* LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker"); - // these are not results from our last request - if (query_id != floater->mQueryID) + // floater is closed or these are not results from our last request + if (NULL == floater || query_id != floater->mQueryID) { return; } |