diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
| commit | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch) | |
| tree | 8debcaecdd87271f618daeb8500e7032968c5202 /indra/newview/llviewerinventory.cpp | |
| parent | cb8b30864f08947a23379eabcac63c2ceee62f7c (diff) | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
Automated merge with file:///Users/Bill/Projects/viewer-release
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 75a5b14154..7dbaa4cf92 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1776,9 +1776,9 @@ PermissionMask LLViewerInventoryItem::getPermissionMask() const //---------- -void LLViewerInventoryItem::onCallingCardNameLookup(const LLUUID& id, const std::string& first_name, const std::string& last_name) +void LLViewerInventoryItem::onCallingCardNameLookup(const LLUUID& id, const std::string& name, bool is_group) { - rename(first_name + " " + last_name); + rename(name); gInventory.addChangedMask(LLInventoryObserver::LABEL, getUUID()); gInventory.notifyObservers(); } |