diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
| commit | 652c8f6b5e91e1333854ac5e300b0bf650d03fc2 (patch) | |
| tree | 4c0375dddbf315baa73c30fe648eb0915f3e3f2a /indra/newview/llfriendcard.cpp | |
| parent | af9b99b457a6a6ab9f04a20bcde6a90091321375 (diff) | |
| parent | 062d0a13db505636b186084d42c527a49637f380 (diff) | |
merge
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; |