diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-10 22:49:19 +0200 | 
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-10 22:49:19 +0200 | 
| commit | b8b619ddebaeee68cd1cef694d43773d24cc5c7b (patch) | |
| tree | d7c3a57226d8732e2c7153e691ee072205b02d32 /indra | |
| parent | 1967034ca0a71f95ddcd793187a3e07d3acc6639 (diff) | |
Fixed broken highlighting of items matching filter in teleport history.
Some forgot to replace all references to mFilterSubstring with sFilterSubstring.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llpanelteleporthistory.h | 1 | 
2 files changed, 3 insertions, 4 deletions
| diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index 43f80f6d6a..596bd2909a 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -505,7 +505,7 @@ void LLTeleportHistoryPanel::refresh()  			tab->setVisible(true);  			// Expand all accordion tabs when filtering -			if(!mFilterSubString.empty()) +			if(!sFilterSubString.empty())  			{  				tab->setDisplayChildren(true);  			} @@ -521,7 +521,7 @@ void LLTeleportHistoryPanel::refresh()  		if (curr_flat_view)  		{ -			LLTeleportHistoryFlatItem* item = new LLTeleportHistoryFlatItem(mCurrentItem, &mContextMenu, items[mCurrentItem].mTitle, mFilterSubString); +			LLTeleportHistoryFlatItem* item = new LLTeleportHistoryFlatItem(mCurrentItem, &mContextMenu, items[mCurrentItem].mTitle, sFilterSubString);  			curr_flat_view->addItem(item);  			if (mLastSelectedItemIndex == mCurrentItem) @@ -569,7 +569,7 @@ void LLTeleportHistoryPanel::replaceItem(S32 removed_index)  	LLTeleportHistoryFlatItem* item = new LLTeleportHistoryFlatItem(history_items.size(), // index will be decremented inside loop below  									&mContextMenu,  									history_items[history_items.size() - 1].mTitle, // Most recent item, it was -									mFilterSubString); +									sFilterSubString);  															 // added instead of removed  	fv->addItem(item, LLUUID::null, ADD_TOP); diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h index f646fea355..0c0f891f32 100644 --- a/indra/newview/llpanelteleporthistory.h +++ b/indra/newview/llpanelteleporthistory.h @@ -109,7 +109,6 @@ private:  	S32				mLastSelectedItemIndex;  	bool				mDirty;  	S32				mCurrentItem; -	std::string				mFilterSubString;  	typedef LLDynamicArray<LLAccordionCtrlTab*> item_containers_t;  	item_containers_t mItemContainers; | 
