diff options
| author | simon <none@none> | 2013-04-11 16:04:21 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:04:21 -0700 |
| commit | c7bab8ab8b25249d1f8f87746b50fce4820f542a (patch) | |
| tree | f10f811e0a03002b4c545eb5c51f99d7c5b83a5b /indra/newview/llinventorylistitem.cpp | |
| parent | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorylistitem.cpp')
| -rw-r--r-- | indra/newview/llinventorylistitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index 3e0849a795..0601796436 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -37,6 +37,7 @@ #include "lltextutil.h" // newview +#include "llinventoryicon.h" #include "llinventorymodel.h" #include "llviewerinventory.h" @@ -230,7 +231,7 @@ const std::string& LLPanelInventoryListItemBase::getDescription() const { return LLStringUtil::null; } - return inv_item->getDescription(); + return inv_item->getActualDescription(); } time_t LLPanelInventoryListItemBase::getCreationDate() const |