From 4e76ec36a0e5bead2c806a06b62845488abf8fa5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 14 Apr 2010 18:54:06 +0300
Subject: [PATCH] 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)
---
indra/newview/llfloateravatarpicker.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index a0b2de85f06..8b5d334c86d 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;
}
--
GitLab