diff options
author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/newview/llviewerinventory.h | |
parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rw-r--r-- | indra/newview/llviewerinventory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 074d51b8b3..b3053e365b 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -39,6 +39,7 @@ class LLFolderView; class LLFolderBridge; class LLViewerInventoryCategory; class LLInventoryCallback; +class LLAvatarName; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLViewerInventoryItem @@ -158,7 +159,7 @@ public: PermissionMask getPermissionMask() const; // callback - void onCallingCardNameLookup(const LLUUID& id, const std::string& name, bool is_group); + void onCallingCardNameLookup(const LLUUID& id, const LLAvatarName& name); // If this is a broken link, try to fix it and any other identical link. BOOL regenerateLink(); |