diff options
| author | angela <angela@lindenlab.com> | 2010-03-04 10:35:51 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-03-04 10:35:51 +0800 |
| commit | f9815a6d13074cc3d1adda5aa41171f855097977 (patch) | |
| tree | e960736102bb2a4f9cd46a6cbf7e04d4e0f0b187 /indra/newview/llfriendcard.h | |
| parent | 06b5cd096f9125c8c9b472487e841c19f5e62015 (diff) | |
| parent | 2b5ea03a40c7bdd5962dc25c807b4ce5abb49bde (diff) | |
merge
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 b94d5ec2c0..1cda52c1d7 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& localizedName) const; + const LLUUID& findChildFolderUUID(const LLUUID& parentFolderUUID, const std::string& nonLocalizedName) const; const LLUUID& findFriendFolderUUIDImpl() const; const LLUUID& findFriendAllSubfolderUUIDImpl() const; const LLUUID& findFriendCardInventoryUUIDImpl(const LLUUID& avatarID); |