1 files changed, 10 insertions, 12 deletions
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 4b2d32ac60..8896c3d238 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -342,20 +342,18 @@ void LLPanelProfilePicks::processProperties(const LLAvatarPicks* avatar_picks)
 
     mSheduledPickCreation.clear();
 
-    BOOL no_data = !mTabContainer->getTabCount();
-    mNoItemsLabel->setVisible(no_data);
-    if (no_data)
+    if (getSelfProfile())
     {
-        if (getSelfProfile())
-        {
-            mNoItemsLabel->setValue(LLTrans::getString("NoPicksText"));
-        }
-        else
-        {
-            mNoItemsLabel->setValue(LLTrans::getString("NoAvatarPicksText"));
-        }
+        mNoItemsLabel->setValue(LLTrans::getString("NoPicksText"));
     }
-    else if (!has_selection)
+    else
+    {
+        mNoItemsLabel->setValue(LLTrans::getString("NoAvatarPicksText"));
+    }
+
+    bool has_data = mTabContainer->getTabCount() > 0;
+    mNoItemsLabel->setVisible(!has_data);
+    if (has_data && !has_selection)
     {
         mTabContainer->selectFirstTab();
     }