diff options
| author | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
| commit | 18ebacefcfb5909a58a213a97c6a687afe9b877e (patch) | |
| tree | 5b48ebad64a253bd9aa50371c2308389cbec64bf /indra/newview/llviewerinventory.cpp | |
| parent | 34d1d34ca100fd137c2a85f0e0f330730fb70aba (diff) | |
| parent | 42606dbbb5f452211e4fc30ee0ed41334fc14e8d (diff) | |
Merge with viewer 2 beta 4
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 80336e5c5a..4d6756c573 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1583,9 +1583,9 @@ bool LLViewerInventoryItem::checkPermissionsSet(PermissionMask mask) 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(); } |