diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
| commit | 525de5554022b946641db446a5b5153f9e670e10 (patch) | |
| tree | d7d679724515f6eb839f87161510ba0a0d06c89b /indra/newview/llviewerinventory.h | |
| parent | 219cd6ecda60e1c48852f582f0994573fd0e10ae (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 7f5a92eeab..1af06a1be8 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -157,7 +157,7 @@ public: PermissionMask getPermissionMask() const; // callback - void onCallingCardNameLookup(const LLUUID& id, const std::string& first_name, const std::string& last_name); + void onCallingCardNameLookup(const LLUUID& id, const std::string& name, bool is_group); // If this is a broken link, try to fix it and any other identical link. BOOL regenerateLink(); |