summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-04-14 18:54:06 +0300
committerMike Antipov <mantipov@productengine.com>2010-04-14 18:54:06 +0300
commit4e76ec36a0e5bead2c806a06b62845488abf8fa5 (patch)
tree462bc5026b260c864a7f92ba9fbbd76ba3e5d787 /indra
parent956041ff1b26edc7c90fb7dbdf0d6ebff82e48b8 (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/ (transplanted from 480f67e4eac0223626ce549a20760e81c4bce5b1)
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloateravatarpicker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index a0b2de85f0..8b5d334c86 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -387,8 +387,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;
}