diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-11 16:01:44 -0500 |
| commit | 99590047eb322d76a90c417bf0e6b2ec0e189d52 (patch) | |
| tree | eaab40ba586d097bf5c1dd4b6ef673c1284ff477 /indra/newview/llfolderviewitem.cpp | |
| parent | d2b72fe0184fb92f4a79eebd242825fbcc5f32e9 (diff) | |
| parent | 1f3a55470919bf451f9c45b454d9bbf815a3e88a (diff) | |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 220fd75191..135821f662 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -40,6 +40,7 @@ #include "llinventoryfilter.h" #include "llpanel.h" #include "llviewercontrol.h" // gSavedSettings +#include "llviewerinventory.h" #include "llviewerwindow.h" // Argh, only for setCursor() // linden library includes @@ -604,6 +605,11 @@ const std::string& LLFolderViewItem::getSearchableLabel() const return mSearchableLabel; } +LLViewerInventoryItem * LLFolderViewItem::getInventoryItem(void) +{ + return gInventory.getItem(getListener()->getUUID()); +} + std::string LLFolderViewItem::getName( void ) const { if(mListener) |