From ab320a12e62152907bbec150972a9ac8a0e244fb Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 19 Aug 2010 15:48:51 -0700 Subject: DEV-52702 Avatar search in Viewer hangs with Searching... when searching for invalid characters in Viewer --- indra/newview/llfloateravatarpicker.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 8c39a8a2df..b44ebd043f 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -393,7 +393,9 @@ public: //LLSDSerialize::toPrettyXML(content, ss); //llinfos << ss.str() << llendl; - if (isGoodStatus(status)) + // in case of invalid characters, the avatar picker returns a 400 + // just set it to process so it displays 'not found' + if (isGoodStatus(status) || status == 400) { LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance("avatar_picker"); @@ -405,7 +407,8 @@ public: else { llinfos << "avatar picker failed " << status - << " reason " << reason << llendl; + << " reason " << reason << llendl; + } } }; -- cgit v1.2.3