SL-18776 Fix handling for an empty avatar list

1 files changed, 6 insertions, 5 deletions

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 7cd2e0146a..2422596f60 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -680,7 +680,12 @@ void LLFloaterAvatarPicker::processResponse(const LLUUID& query_id, const LLSD&
         // clear "Searching" label on first results
         search_results->deleteAllItems();
 
-        if (content.has("agents"))
+        if (content.has("failure_reason"))
+        {
+            getChild<LLScrollListCtrl>("SearchResults")->setCommentText(content["failure_reason"].asString());
+            getChildView("ok_btn")->setEnabled(false);
+        }
+        else
         {
             LLSD agents = content["agents"];
 
@@ -733,10 +738,6 @@ void LLFloaterAvatarPicker::processResponse(const LLUUID& query_id, const LLSD&
                 search_results->setFocus(TRUE);
             }
         }
-        else if (content.has("failure_reason"))
-        {
-            getChild<LLScrollListCtrl>("SearchResults")->setCommentText(content["failure_reason"].asString());
-        }
 	}
 }