diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-10 16:09:00 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-10 16:09:00 -0500 |
| commit | f0146befc76f401c344ae2759c70b67b37cbf717 (patch) | |
| tree | f0f8bae973049510e04a54fa225c0daabfb960b5 /indra/newview/llfolderviewitem.cpp | |
| parent | 99d757e04152a291ca14c8cb432597de8f2b61e2 (diff) | |
| parent | 9db47b1d4bc9c24adf23f862c729464d9422e6a3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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 5bef306485..fe793fbcb8 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 @@ -603,6 +604,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) |