diff options
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llflatlistview.h | 2 | ||||
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 2 | 
4 files changed, 5 insertions, 5 deletions
| diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index 2e5aeec41d..bc34012267 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -243,7 +243,7 @@ LLUUID LLFlatListView::getSelectedUUID() const  	}  } -void LLFlatListView::getSelectedUUIDs(std::vector<LLUUID>& selected_uuids) const +void LLFlatListView::getSelectedUUIDs(uuid_vec_t& selected_uuids) const  {  	if (mSelectedItemPairs.empty()) return; diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 92cb40332e..837fbb36b7 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -224,7 +224,7 @@ public:  	 * Get LLUUIDs associated with selected items  	 * @param selected_uuids An std::vector being populated with LLUUIDs associated with selected items  	 */ -	virtual void getSelectedUUIDs(std::vector<LLUUID>& selected_uuids) const; +	virtual void getSelectedUUIDs(uuid_vec_t& selected_uuids) const;  	/** Get the top selected item */  	virtual LLPanel* getSelectedItem() const; diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 77caaaa425..bf0866a655 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -957,14 +957,14 @@ void LLScrollListCtrl::mouseOverHighlightNthItem(S32 target_index)  	}  } -S32	LLScrollListCtrl::selectMultiple( std::vector<LLUUID> ids ) +S32	LLScrollListCtrl::selectMultiple( uuid_vec_t ids )  {  	item_list::iterator iter;  	S32 count = 0;  	for (iter = mItemList.begin(); iter != mItemList.end(); iter++)  	{  		LLScrollListItem* item = *iter; -		std::vector<LLUUID>::iterator iditr; +		uuid_vec_t::iterator iditr;  		for(iditr = ids.begin(); iditr != ids.end(); ++iditr)  		{  			if (item->getEnabled() && (item->getUUID() == (*iditr))) diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index ebdc82115f..1f0ef585db 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -379,7 +379,7 @@ public:  	BOOL			getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }  	BOOL			hasSortOrder() const; -	S32		selectMultiple( std::vector<LLUUID> ids ); +	S32		selectMultiple( uuid_vec_t ids );  	// conceptually const, but mutates mItemList  	void			updateSort() const;  	// sorts a list without affecting the permanent sort order (so further list insertions can be unsorted, for example) | 
