diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-17 17:58:17 -0500 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-17 17:58:17 -0500 |
commit | 32178873564f86f0ab9ee06d485486fc9d609012 (patch) | |
tree | 4beae7908cbdd5e6af5241682110ac958b7c56ae /indra/newview/llfriendcard.h | |
parent | 064fb26092ac9f73f9d0301f1e214e27e8418839 (diff) | |
parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) |
Merge of viewer2 into avp
--HG--
branch : avatar-pipeline
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); |