diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
| commit | 068e3cc469793c75b0d54ef0864388582bb3b63c (patch) | |
| tree | dbab152cf43bc84f23b2f63f9e8f8d83117e28af /indra/newview/llviewerinventory.cpp | |
| parent | e748167abfabbc541c3ceb9e2d5a46fa3564f15a (diff) | |
| parent | 8158c5637a9ad83a7b36b104116c37390b57c7ab (diff) | |
pull fix for STORM-304 / STORM-386
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(); } |