diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-22 14:45:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-22 14:45:53 +0100 |
| commit | 27b593dbf646a278528d39f58e0b85f73d0be4cd (patch) | |
| tree | 7b50b1b438fb74c031c4d0bf06ad2af3f6122f28 /indra/newview/llfolderviewitem.cpp | |
| parent | 1200c4aabfed19fb4e8e330041bb1f3694ee7aab (diff) | |
| parent | 36253ae8bf1ca6dd53b747a4da87a5008f61c697 (diff) | |
merge whitespace changes from Boroondas.
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 316f78d1e2..3c36248c1f 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -528,9 +528,9 @@ BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selecte void LLFolderViewItem::deselectItem(void) { llassert(mIsSelected); - + mIsSelected = FALSE; - + // Update ancestors' count of selected descendents. LLFolderViewFolder* parent_folder = getParentFolder(); if (parent_folder) @@ -542,9 +542,9 @@ void LLFolderViewItem::deselectItem(void) void LLFolderViewItem::selectItem(void) { llassert(!mIsSelected); - + mIsSelected = TRUE; - + // Update ancestors' count of selected descendents. LLFolderViewFolder* parent_folder = getParentFolder(); if (parent_folder) @@ -1107,7 +1107,7 @@ void LLFolderViewItem::draw() LLFolderViewFolder::LLFolderViewFolder( const LLFolderViewItem::Params& p ): LLFolderViewItem( p ), // 0 = no create time - mNumDescendantsSelected(0), + mNumDescendantsSelected(0), mIsOpen(FALSE), mExpanderHighlighted(FALSE), mCurHeight(0.f), @@ -1499,10 +1499,10 @@ void LLFolderViewFolder::recursiveIncrementNumDescendantsSelected(S32 increment) do { parent_folder->mNumDescendantsSelected += increment; - + // Make sure we don't have negative values. llassert(parent_folder->mNumDescendantsSelected >= 0); - + parent_folder = parent_folder->getParentFolder(); } while(parent_folder); @@ -1511,7 +1511,7 @@ void LLFolderViewFolder::recursiveIncrementNumDescendantsSelected(S32 increment) // Passes selection information on to children and record selection // information if necessary. BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem, - BOOL take_keyboard_focus) + BOOL take_keyboard_focus) { BOOL rv = FALSE; if (selection == this) |