diff options
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
-rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index b541b279d0..0ba0ab89b1 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -188,7 +188,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) { |