diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:28:40 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:28:40 -0700 |
| commit | 3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (patch) | |
| tree | 078d2f9d44e5d6f0fc0f47cee388377eb8c0e0ed /indra/llui/llfolderview.cpp | |
| parent | 05a72687d848c13754039f6e720a137827533fdb (diff) | |
| parent | c320b4878ae9cd166594285a88437f0d5c333353 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 9a4a90206b..c1a11851e2 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -286,7 +286,7 @@ void LLFolderView::addFolder( LLFolderViewFolder* folder) //{ // mFolders.insert(mFolders.begin(), folder); //} - } +} void LLFolderView::closeAllFolders() { @@ -309,7 +309,7 @@ void LLFolderView::openTopLevelFolders() // *width should be 0 // conform show folder state works S32 LLFolderView::arrange( S32* unused_width, S32* unused_height ) - { + { mMinWidth = 0; S32 target_height; @@ -856,7 +856,7 @@ void LLFolderView::propertiesSelectedItems( void ) // multi_propertiesp->openFloater(LLSD()); // } //} -} + } void LLFolderView::autoOpenItem( LLFolderViewFolder* item ) @@ -1542,7 +1542,7 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask ) if (mCallbackRegistrar) { mCallbackRegistrar->popScope(); - } + } } else { @@ -1718,7 +1718,6 @@ void LLFolderView::update() { mNeedsAutoSelect = TRUE; } - // filter to determine visibility before arranging filter(getFolderViewModel()->getFilter()); // Clear the modified setting on the filter only if the filter count is non-zero after running the filter process @@ -1727,7 +1726,7 @@ void LLFolderView::update() { getFolderViewModel()->getFilter().clearModified(); } - + // automatically show matching items, and select first one if we had a selection if (mNeedsAutoSelect) { |