diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-15 07:08:22 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-15 07:08:22 +0300 |
| commit | 740159f004b2d9ef4111b8db25ed7f1d56ddb254 (patch) | |
| tree | fce4bfe9dd7ea278a83bcb9f6c94b835f48ed3a8 /indra/newview/llviewerobject.cpp | |
| parent | c00065a205fa166410cedbfe31ce74f2198911a6 (diff) | |
| parent | 2540868bf38b39da4c94714f507941386e72da7c (diff) | |
Merged in lindenlab/viewer-bear
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()); |