summaryrefslogtreecommitdiff
path: root/indra/newview/llfriendcard.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-17 09:28:26 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-17 09:28:26 +0000
commita402f4894d72209f9ac9bc9d7962c28b3c26bb18 (patch)
tree1db4f4a35008b6f4281e6275b7a4beb679d285d6 /indra/newview/llfriendcard.h
parentb42b421d25f3b3a7ea4f571388acb64f98e1f51d (diff)
parentccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff)
merge.
Diffstat (limited to 'indra/newview/llfriendcard.h')
-rw-r--r--indra/newview/llfriendcard.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index 98dc3153d0..b94d5ec2c0 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -120,7 +120,7 @@ private:
return (mBuddyIDSet.end() != mBuddyIDSet.find(avatarID));
}
- const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& folderLabel) const;
+ const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& localizedName) const;
const LLUUID& findFriendFolderUUIDImpl() const;
const LLUUID& findFriendAllSubfolderUUIDImpl() const;
const LLUUID& findFriendCardInventoryUUIDImpl(const LLUUID& avatarID);