diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
| commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
| tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/newview/llviewerinventory.cpp | |
| parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
| parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) | |
merge with STORM-105
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(); } |