summaryrefslogtreecommitdiff
path: root/indra/newview/llfriendcard.cpp
diff options
context:
space:
mode:
authorRamzi Linden <ramzi@lindenlab.com>2009-11-10 13:17:26 +0800
committerRamzi Linden <ramzi@lindenlab.com>2009-11-10 13:17:26 +0800
commit4204cce0cec2c3386f751dfdfeb959da6136ce61 (patch)
treebd16bb887eefd7c2998e3d28aad14ec8ce9dd73c /indra/newview/llfriendcard.cpp
parent729e0b125287586f19f862ec5221bf11d9e5fe49 (diff)
parentae27a93395ef01535e03e02ec9fa5e221ce58e23 (diff)
merge
Diffstat (limited to 'indra/newview/llfriendcard.cpp')
-rw-r--r--indra/newview/llfriendcard.cpp2
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;