1 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index 6989084..3bb2462 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -208,7 +208,12 @@ void LLFloaterAvatarPicker::onSelectionChange(const std::deque<LLFolderViewItem*
         self->mAvatarIDs.clear();
         self->mAvatarNames.clear();
 
-        self->childSetEnabled("Select", FALSE);
+        // if we have calling cards, disable select button until 
+        // the inventory picks a valid calling card
+        if (!items.empty())
+        {
+                self->childSetEnabled("Select", FALSE);
+        }
 
         if (!self->mListNames)
         {