diff options
| author | angela <angela@lindenlab.com> | 2009-11-10 12:15:42 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-10 12:15:42 +0800 |
| commit | ae27a93395ef01535e03e02ec9fa5e221ce58e23 (patch) | |
| tree | 0529dc96ad0f1ed9513652aad18e9702d676b772 /indra/newview/llfriendcard.cpp | |
| parent | 5662a8d126b3dab1100aab014aeaeb1752dba26a (diff) | |
| parent | 6106c9a7dadcf0ba4a33ad1ee826ccd31909b893 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llfriendcard.cpp')
| -rw-r--r-- | indra/newview/llfriendcard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp index c956657825..1ff2566dca 100644 --- a/indra/newview/llfriendcard.cpp +++ b/indra/newview/llfriendcard.cpp @@ -519,7 +519,7 @@ bool LLFriendCardsManager::addFriendCardToInventory(const LLUUID& avatarID) } LLUUID friendListFolderID = findFriendAllSubfolderUUIDImpl(); - if (shouldBeAdded && !invModel->isCategoryComplete(friendListFolderID)) + if (friendListFolderID.notNull() && shouldBeAdded && !invModel->isCategoryComplete(friendListFolderID)) { mFriendsAllFolderCompleted = false; shouldBeAdded = false; |