summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-08-19 15:48:51 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-08-19 15:48:51 -0700
commitab320a12e62152907bbec150972a9ac8a0e244fb (patch)
treead4f386f6e819262f90dc2f20db2ee839559f038
parenteaf235978232d4ec69d95af562d7f5f52a2c09e7 (diff)
DEV-52702 Avatar search in Viewer hangs with Searching... when searching for invalid characters in Viewer
-rw-r--r--indra/newview/llfloateravatarpicker.cpp7
1 files changed, 5 insertions, 2 deletions
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<LLFloaterAvatarPicker>("avatar_picker");
@@ -405,7 +407,8 @@ public:
else
{
llinfos << "avatar picker failed " << status
- << " reason " << reason << llendl;
+ << " reason " << reason << llendl;
+
}
}
};