diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2016-10-11 16:06:04 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2016-10-11 16:06:04 +0300 |
| commit | 061b918deea9a07e9d3e44e18a86afefc3740898 (patch) | |
| tree | 520a7109e91cb33fd0680e0b6cc7474b215f164a /indra/newview/llviewerobject.cpp | |
| parent | 4617e07b3795e46c2037462f738ab81b35bd7294 (diff) | |
| parent | 6be5e1eb01a5b12ee4152ae9d4f53110a4bea246 (diff) | |
Merged in MAINT-6792 (pull request #22)
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 72a8595845..5f4eeaa37b 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -6307,7 +6307,7 @@ const LLUUID &LLViewerObject::extractAttachmentItemID() return getAttachmentItemID(); } -const std::string& LLViewerObject::getAttachmentItemName() +const std::string& LLViewerObject::getAttachmentItemName() const { static std::string empty; LLInventoryItem *item = gInventory.getItem(getAttachmentItemID()); |