diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
commit | be666bc14f7252b5cfa0b9c2e34f170f5e24c4d3 (patch) | |
tree | 282683cfddf5c624a72cd3f21cd66f18818cba77 /indra/newview/llfriendcard.h | |
parent | 211529eee9a4cbb36961af75e94af73da920d08d (diff) | |
parent | aba8b04cfc6763ee565a5ae9929e8be044272b08 (diff) |
merge from product-engine
Diffstat (limited to 'indra/newview/llfriendcard.h')
-rw-r--r-- | indra/newview/llfriendcard.h | 2 |
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); |