diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-09-21 14:05:31 +0200 | 
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-09-21 14:05:31 +0200 | 
| commit | 36253ae8bf1ca6dd53b747a4da87a5008f61c697 (patch) | |
| tree | 5f0639512bdefa7c01fa84476a2968b564de71ac /indra/newview | |
| parent | 136029821ca37dbe7d7707a0fb0422612a31bae6 (diff) | |
fixed some whitespace errors in files touched by STORM-162
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfolderview.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llfolderviewitem.h | 18 | 
3 files changed, 18 insertions, 18 deletions
| diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index f9c48c3ca7..66ab4ce5eb 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -150,7 +150,7 @@ public:  	void setSelectionByID(const LLUUID& obj_id, BOOL take_keyboard_focus);  	// Called once a frame to update the selection if mSelectThisID has been set -	void updateSelection();  +	void updateSelection();  	// This method is used to toggle the selection of an item. Walks  	// children, and keeps track of selected objects. 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) diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h index 9e819aaaaa..ab9317afd9 100644 --- a/indra/newview/llfolderviewitem.h +++ b/indra/newview/llfolderviewitem.h @@ -108,7 +108,7 @@ public:  	// layout constants  	static const S32 LEFT_PAD = 5; -    // LEFT_INDENTATION is set via folder_indentation above +	// LEFT_INDENTATION is set via folder_indentation above  	static const S32 ICON_PAD = 2;  	static const S32 ICON_WIDTH = 16;  	static const S32 TEXT_PAD = 1; @@ -217,21 +217,21 @@ public:  	// If 'selection' is 'this' then note that otherwise ignore.  	// Returns TRUE if this item ends up being selected.  	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus); -     +  	// This method is used to set the selection state of an item.  	// If 'selection' is 'this' then note selection.  	// Returns TRUE if the selection state of this item was changed.  	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected); -     +  	// this method is used to group select items  	virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items) { } -     +  	// this method is used to deselect this element  	void deselectItem(); -     +  	// this method is used to select this element  	void selectItem(); -     +  	// gets multiple-element selection  	virtual std::set<LLUUID> getSelectionList() const; @@ -253,7 +253,7 @@ public:  	BOOL getIsCurSelection() { return mIsCurSelection; }  	BOOL hasVisibleChildren() { return mHasVisibleChildren; } -	 +  	void setShowLoadStatus(bool status) { mShowLoadStatus = status; }  	// Call through to the viewed object and return true if it can be @@ -437,13 +437,13 @@ public:  	// Returns TRUE if this object (or a child) ends up being selected.  	// If 'openitem' is TRUE then folders are opened up along the way to the selection.  	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus); -     +  	// This method is used to change the selection of an item.  	// Recursively traverse all children; if 'selection' is 'this' then change  	// the select status if necessary.  	// Returns TRUE if the selection state of this folder, or of a child, was changed.  	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected); -     +  	// this method is used to group select items  	virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items); | 
