diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-02 09:45:59 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-02 09:45:59 -0700 |
| commit | a87b27c41ddef15fa4027549c38b0129107ff9f6 (patch) | |
| tree | 980583c52a68f94742abe157a3947e1a0a1d343c /indra/llui/llfolderviewitem.cpp | |
| parent | 1d6957ce09f92df6c0766162de1a84547f40e3bd (diff) | |
| parent | 4cb1e766fcfcaba702c2638f4c7daa9dd17bcbd8 (diff) | |
merging of latest code
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
| -rw-r--r-- | indra/llui/llfolderviewitem.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 480332ae70..68b442dd9a 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -801,14 +801,20 @@ void LLFolderViewItem::draw() } const LLFolderViewModelInterface* LLFolderViewItem::getFolderViewModel( void ) const - { +{ return getRoot()->getFolderViewModel(); } LLFolderViewModelInterface* LLFolderViewItem::getFolderViewModel( void ) - { +{ return getRoot()->getFolderViewModel(); - } +} + +bool LLFolderViewItem::isInSelection() const +{ + return mIsSelected || (mParentFolder && mParentFolder->isInSelection()); +} + ///---------------------------------------------------------------------------- |