f

2010-08-22 15:14:30 -04:00
parent 88cf144936
commit 5ce4286fd7
164 changed files with 31303 additions and 22286 deletions
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -162,6 +162,7 @@ LLFolderViewItem::LLFolderViewItem( const std::string& name, LLUIImagePtr icon,
 	mIcon(icon),
 	mHasVisibleChildren(FALSE),
 	mIndentation(0),
+	mNumDescendantsSelected(0),
 	mFiltered(FALSE),
 	mLastFilterGeneration(-1),
 	mStringMatchOffset(std::string::npos),
@@ -281,19 +282,23 @@ void LLFolderViewItem::refreshFromListener()
 {
 	if(mListener)
 	{
-		mLabel = mListener->getDisplayName();
-		setIcon(mListener->getIcon());
-		time_t creation_date = mListener->getCreationDate();
-		if (mCreationDate != creation_date)
-		{
-			mCreationDate = mListener->getCreationDate();
-			dirtyFilter();
-		}
-		mLabelStyle = mListener->getLabelStyle();
-		mLabelSuffix = mListener->getLabelSuffix();
-
+		//Super crazy hack to build the creator search label - RK
 		LLInventoryItem* item = gInventory.getItem(mListener->getUUID());
-
+		std::string creator_name;
+		if(item)
+		{
+			if(item->getCreatorUUID().notNull())
+			{
+				gCacheName->getFullName(item->getCreatorUUID(), creator_name);
+			}
+		}
+		mLabelCreator = creator_name;
+		/*if(creator_name == "(Loading...)")
+			mLabelCreator = "";
+		else
+			mLabelCreator = creator_name;*/
+		
+		//Label for desc search
 		std::string desc;
 		if (item)
 		{
@@ -303,18 +308,23 @@ void LLFolderViewItem::refreshFromListener()
 				LLStringUtil::toUpper(desc);
 			}
 		}
-		mSearchableLabelDesc = desc;
+		mLabelDesc = desc;

-		std::string creator_name;
-		if (item)
+		//Label for name search
+		mLabel = mListener->getDisplayName();
+
+		//Build label for combined search - RK
+		mLabelAll = mLabel + " " + mLabelCreator + " " + mLabelDesc;
+
+		setIcon(mListener->getIcon());
+		time_t creation_date = mListener->getCreationDate();
+		if (mCreationDate != creation_date)
 		{
-			if (item->getCreatorUUID().notNull())
-			{
-				gCacheName->getFullName(item->getCreatorUUID(), creator_name);
-				LLStringUtil::toUpper(creator_name);
-			}
+			mCreationDate = mListener->getCreationDate();
+			dirtyFilter();
 		}
-		mSearchableLabelCreator = creator_name;
+		mLabelStyle = mListener->getLabelStyle();
+		mLabelSuffix = mListener->getLabelSuffix();
 	}
 }

@@ -323,12 +333,32 @@ void LLFolderViewItem::refresh()
 	refreshFromListener();
 	
 	std::string searchable_label(mLabel);
-	searchable_label.append(mLabelSuffix);
-	LLStringUtil::toUpper(searchable_label);
+	std::string searchable_label_creator(mLabelCreator);
+	std::string searchable_label_desc(mLabelDesc);
+	std::string searchable_label_all(mLabelAll);

-	if (mSearchableLabel.compare(searchable_label))
+	//add the (no modify), (no transfer) etc stuff to each label.
+	searchable_label.append(mLabelSuffix);
+	searchable_label_creator.append(mLabelSuffix);
+	searchable_label_desc.append(mLabelSuffix);
+	searchable_label_all.append(mLabelSuffix);
+
+	//all labels need to be uppercase.
+	LLStringUtil::toUpper(searchable_label);
+	LLStringUtil::toUpper(searchable_label_creator);
+	LLStringUtil::toUpper(searchable_label_desc);
+	LLStringUtil::toUpper(searchable_label_all);
+
+		if (mSearchableLabel.compare(searchable_label) ||
+		mSearchableLabelCreator.compare(searchable_label_creator) ||
+		mSearchableLabelDesc.compare(searchable_label_desc) || 
+		mSearchableLabelAll.compare(searchable_label_all))
 	{
 		mSearchableLabel.assign(searchable_label);
+		mSearchableLabelCreator.assign(searchable_label_creator);
+		mSearchableLabelDesc.assign(searchable_label_desc);
+		mSearchableLabelAll.assign(searchable_label_all);
+
 		dirtyFilter();
 		// some part of label has changed, so overall width has potentially changed
 		if (mParentFolder)
@@ -490,16 +520,9 @@ BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL openitem,

 BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selected)
 {
-	if (selection == this && mIsSelected != selected)
+	if(selection == this && mIsSelected != selected)
 	{
-	  	if (mIsSelected)
-		{
-			deselectItem();
-		}
-		else
-		{
-			selectItem();
-		}
+		mIsSelected = selected;
 		if(mListener)
 		{
 			mListener->selectItem();
@@ -509,6 +532,22 @@ BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selecte
 	return FALSE;
 }

+void LLFolderViewItem::recursiveDeselect(BOOL deselect_self)
+{
+	if (mIsSelected && deselect_self)
+	{
+		mIsSelected = FALSE;
+
+		// update ancestors' count of selected descendents
+		LLFolderViewFolder* parent_folder = getParentFolder();
+		while(parent_folder)
+		{
+			parent_folder->mNumDescendantsSelected--;
+			parent_folder = parent_folder->getParentFolder();
+		}
+	}
+}
+
 void LLFolderViewItem::deselectItem(void)
 {
 	llassert(mIsSelected);
@@ -611,6 +650,16 @@ void LLFolderViewItem::preview( void )
 	}
 }

+
+
+
+
+
+
+
+
+
+
 void LLFolderViewItem::rename(const std::string& new_name)
 {
 	if( !new_name.empty() )
@@ -628,31 +677,20 @@ void LLFolderViewItem::rename(const std::string& new_name)
 	}
 }

-std::string& LLFolderViewItem::getSearchableLabel()
+const std::string& LLFolderViewItem::getSearchableLabel() const
 {
-	mSearchable = "";
-	U32 flags = mRoot->getSearchType();
-	if (flags == 0 || (flags & 1))
+	U32 type = mRoot->getFilter()->getSearchType();
+	switch(type)
 	{
-		mSearchable = mSearchableLabel;
+	case 1:
+		return mSearchableLabelCreator;
+	case 2:
+		return mSearchableLabelDesc;
+	case 3:
+		return mSearchableLabelAll;
+	default:
+		return mSearchableLabel;
 	}
-	if (flags & 2)
-	{
-		if (mSearchable.length())
-		{
-			mSearchable += " ";
-		}
-		mSearchable += mSearchableLabelDesc;
-	}
-	if (flags & 4)
-	{
-		if (mSearchable.length())
-		{
-			mSearchable += " ";
-		}
-		mSearchable += mSearchableLabelCreator;
-	}
-	return mSearchable;
 }

 const std::string& LLFolderViewItem::getName( void ) const
@@ -738,12 +776,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
 				{
 					src = LLToolDragAndDrop::SOURCE_LIBRARY;
 				}
-				// <edit>
-				else if(mListener && gInventory.isObjectDescendentOf(mListener->getUUID(), gLocalInventoryRoot))
-				{ // Note: this is only ok if all future pretend folders are subcategories of Pretend Inventory
-					src = LLToolDragAndDrop::SOURCE_LIBRARY;
-				}
-				// </edit>
+
 				can_drag = root->startDrag(src);
 				if (can_drag)
 				{
@@ -784,10 +817,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )

 BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-	// <edit>
-	//preview();
-	openItem();
-	// </edit>
+	preview();
 	return TRUE;
 }

@@ -1018,13 +1048,16 @@ void LLFolderViewItem::draw()
 		if (sBoxImage.notNull() && mStringMatchOffset != std::string::npos)
 		{
 			// don't draw backgrounds for zero-length strings
-			std::string combined_string = mLabel + mLabelSuffix;
 			S32 filter_string_length = mRoot->getFilterSubString().size();
-			std::string combined_string_upper = combined_string;
-			LLStringUtil::toUpper(combined_string_upper);
-			if (filter_string_length > 0 && (mRoot->getSearchType() & 1) &&
-				combined_string_upper.find(mRoot->getFilterSubString()) == mStringMatchOffset)
+			std::string combined_string = mLabel + mLabelSuffix;
+			
+			//fix so that highlighting works properly again - rkeast
+			std::string check = combined_string;
+			LLStringUtil::toUpper(check);
+
+			if ((filter_string_length > 0) && (check.find(mRoot->getFilterSubString()) != -1))
 			{
+//				llinfos << "mLabel " << mLabel<< " mLabelSuffix " << mLabelSuffix << " mLabel " << mLabel << " mLabel " << mLabel << llendl;
 				S32 left = llround(text_left) + sFont->getWidth(combined_string, 0, mStringMatchOffset) - 1;
 				S32 right = left + sFont->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
 				S32 bottom = llfloor(getRect().getHeight() - sFont->getLineHeight() - 3);
@@ -1447,10 +1480,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem
 	BOOL rv = FALSE;
 	if( selection == this )
 	{
-	  	if (!isSelected())
-		{
-			selectItem();
-		}
+		mIsSelected = TRUE;
 		if(mListener)
 		{
 			mListener->selectItem();
@@ -1459,10 +1489,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem
 	}
 	else
 	{
-	  	if (isSelected())
-		{
-			deselectItem();
-		}
+		mIsSelected = FALSE;
 		rv = FALSE;
 	}
 	BOOL child_selected = FALSE;
@@ -1475,6 +1502,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem
 		{
 			rv = TRUE;
 			child_selected = TRUE;
+			mNumDescendantsSelected++;
 		}
 	}
 	for (items_t::iterator iter = mItems.begin();
@@ -1485,6 +1513,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem
 		{
 			rv = TRUE;
 			child_selected = TRUE;
+			mNumDescendantsSelected++;
 		}
 	}
 	if(openitem && child_selected)
@@ -1503,30 +1532,28 @@ BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection, BOOL selec
 	BOOL rv = FALSE;
 	if(selection == this)
 	{
-		if (isSelected() != selected)
-		{
-			rv = TRUE;
-		 	if (selected)
-			{
-				selectItem();
-			}
-			else
-			{
-			  	deselectItem();
-			}
-		}
+		mIsSelected = selected;
 		if(mListener && selected)
 		{
 			mListener->selectItem();
 		}
+		rv = TRUE;
 	}

 	for (folders_t::iterator iter = mFolders.begin();
 		 iter != mFolders.end();)
 	{
 		folders_t::iterator fit = iter++;
-		if ((*fit)->changeSelection(selection, selected))
+		if((*fit)->changeSelection(selection, selected))
 		{
+			if (selected)
+			{
+				mNumDescendantsSelected++;
+			}
+			else
+			{
+				mNumDescendantsSelected--;
+			}
 			rv = TRUE;
 		}
 	}
@@ -1534,22 +1561,33 @@ BOOL LLFolderViewFolder::changeSelection(LLFolderViewItem* selection, BOOL selec
 		 iter != mItems.end();)
 	{
 		items_t::iterator iit = iter++;
-		if ((*iit)->changeSelection(selection, selected))
+		if((*iit)->changeSelection(selection, selected))
 		{
+			if (selected)
+			{
+				mNumDescendantsSelected++;
+			}
+			else
+			{
+				mNumDescendantsSelected--;
+			}
 			rv = TRUE;
 		}
 	}
 	return rv;
 }

-void LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& selected_items)
+S32 LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& selected_items)
 {
+	S32 num_selected = 0;
+
 	// pass on to child folders first
 	for (folders_t::iterator iter = mFolders.begin();
 		 iter != mFolders.end();)
 	{
 		folders_t::iterator fit = iter++;
-		(*fit)->extendSelection(selection, last_selected, selected_items);
+		num_selected += (*fit)->extendSelection(selection, last_selected, selected_items);
+		mNumDescendantsSelected += num_selected;
 	}

 	// handle selection of our immediate children...
@@ -1642,6 +1680,8 @@ void LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVi
 			if (item->changeSelection(item, TRUE))
 			{
 				selected_items.put(item);
+				mNumDescendantsSelected++;
+				num_selected++;
 			}
 		}
 	}
@@ -1651,15 +1691,30 @@ void LLFolderViewFolder::extendSelection(LLFolderViewItem* selection, LLFolderVi
 		if (selection->changeSelection(selection, TRUE))
 		{
 			selected_items.put(selection);
+			mNumDescendantsSelected++;
+			num_selected++;
 		}
 	}
+
+	return num_selected;
 }

 void LLFolderViewFolder::recursiveDeselect(BOOL deselect_self)
 {
-	if (isSelected() && deselect_self)
+	// make sure we don't have negative values
+	llassert(mNumDescendantsSelected >= 0);
+
+	if (mIsSelected && deselect_self)
 	{
-  		deselectItem();
+		mIsSelected = FALSE;
+
+		// update ancestors' count of selected descendents
+		LLFolderViewFolder* parent_folder = getParentFolder();
+		while(parent_folder)
+		{
+			parent_folder->mNumDescendantsSelected--;
+			parent_folder = parent_folder->getParentFolder();
+		}
 	}

 	if (0 == mNumDescendantsSelected)
@@ -1667,19 +1722,14 @@ void LLFolderViewFolder::recursiveDeselect(BOOL deselect_self)
 		return;
 	}

-	// Deselect all items in this folder.
 	for (items_t::iterator iter = mItems.begin();
 		 iter != mItems.end();)
 	{
 		items_t::iterator iit = iter++;
 		LLFolderViewItem* item = (*iit);
-		if (item->isSelected())
-		{
-			item->deselectItem();
-		}
+		item->recursiveDeselect(TRUE);
 	}

-	// Recursively deselect all folders in this folder.
 	for (folders_t::iterator iter = mFolders.begin();
 		 iter != mFolders.end();)
 	{
@@ -2739,59 +2789,6 @@ U32 LLFolderView::getSortOrder() const
 	return mSortOrder;
 }

-U32 LLFolderView::toggleSearchType(std::string toggle)
-{
-	if (toggle == "name")
-	{
-		if (mSearchType & 1)
-		{
-			mSearchType &= 6;
-		}
-		else
-		{
-			mSearchType |= 1;
-		}
-	}
-	else if (toggle == "description")
-	{
-		if (mSearchType & 2)
-		{
-			mSearchType &= 5;
-		}
-		else
-		{
-			mSearchType |= 2;
-		}
-	}
-	else if (toggle == "creator")
-	{
-		if (mSearchType & 4)
-		{
-			mSearchType &= 3;
-		}
-		else
-		{
-			mSearchType |= 4;
-		}
-	}
-	if (mSearchType == 0)
-	{
-		mSearchType = 1;
-	}
-
-	if (getFilterSubString().length())
-	{
-		mFilter.setModified(LLInventoryFilter::FILTER_RESTART);
-	}
-
-	return mSearchType;
-}
-
-U32 LLFolderView::getSearchType() const
-{
-	return mSearchType;
-}
-
 BOOL LLFolderView::addFolder( LLFolderViewFolder* folder)
 {
 	// enforce sort order of My Inventory followed by Library
@@ -2938,6 +2935,7 @@ void LLFolderView::filter( LLInventoryFilter& filter )
 	LLFastTimer t2(LLFastTimer::FTM_FILTER);
 	filter.setFilterCount(llclamp(gSavedSettings.getS32("FilterItemsPerFrame"), 1, 5000));

+
 	if (getCompletedFilterGeneration() < filter.getCurrentGeneration())
 	{
 		mFiltered = FALSE;
@@ -3088,24 +3086,29 @@ BOOL LLFolderView::changeSelection(LLFolderViewItem* selection, BOOL selected)
 	return rv;
 }

-void LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items)
+S32 LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items)
 {
+	S32 rv = 0;
+
 	// now store resulting selection
 	if (mAllowMultiSelect)
 	{
 		LLFolderViewItem *cur_selection = getCurSelectedItem();
-		LLFolderViewFolder::extendSelection(selection, cur_selection, items);
+		rv = LLFolderViewFolder::extendSelection(selection, cur_selection, items);
 		for (S32 i = 0; i < items.count(); i++)
 		{
 			addToSelectionList(items[i]);
+			rv++;
 		}
 	}
 	else
 	{
 		setSelection(selection, FALSE, FALSE);
+		rv++;
 	}

 	mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS;
+	return rv;
 }

 void LLFolderView::sanitizeSelection()
@@ -4628,6 +4631,10 @@ LLInventoryFilter::LLInventoryFilter(const std::string& name) :
 	mModified(FALSE),
 	mNeedTextRebuild(TRUE)
 {
+	//fix to get rid of gSavedSettings use - rkeast
+	mSearchType = 0;
+	mPartialSearch = false;
+
 	mFilterOps.mFilterTypes = 0xffffffff;
 	mFilterOps.mMinDate = time_min();
 	mFilterOps.mMaxDate = time_max();
@@ -4672,13 +4679,50 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
 	}
 	LLFolderViewEventListener* listener = item->getListener();
 	const LLUUID& item_id = listener->getUUID();
-	mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
-	BOOL passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
-					&& (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
+
+	//When searching for all labels, we need to explode the filter string
+	//Into an array, and then compare each string to the label seperately
+	//Otherwise the filter substring needs to be 
+	//formatted in the same order as the label - rkeast
+
+	BOOL passed;
+	//Added ability to toggle this type of searching for all labels cause it's convienient - RKeast
+	if(mSearchType == 3 || mPartialSearch)
+	{
+		std::istringstream i(mFilterSubString);
+		std::string blah;
+		
+		LLDynamicArray<std::string> search_array;
+
+		while(i >> blah)
+		{
+			search_array.put(blah);
+		}
+		
+		BOOL subStringMatch = true;
+		for(int i = 0; i < search_array.getLength(); i++)
+		{
+			mSubStringMatchOffset = (search_array.get(i)).size() ? item->getSearchableLabel().find(search_array.get(i)) : std::string::npos;
+			subStringMatch = subStringMatch && ((search_array.get(i)).size() == 0 || mSubStringMatchOffset != std::string::npos);
+		}
+
+		passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
+					&& (subStringMatch)
 					&& (mFilterWorn == false || gAgent.isWearingItem(item_id) ||
 						(gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id)))
 					&& ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
 					&& (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
+	}	
+	else
+	{
+		mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
+		passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE)
+						&& (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
+						&& (mFilterWorn == false || gAgent.isWearingItem(item_id) ||
+							(gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id)))
+						&& ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
+						&& (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
+	}
 	return passed;
 }

@@ -4727,6 +4771,31 @@ BOOL LLInventoryFilter::isModifiedAndClear()
 	return ret;
 }

+//fix to get rid of gSavedSettings use - rkeast
+void LLInventoryFilter::setPartialSearch(bool toggle)
+{
+	
+	mPartialSearch = toggle;
+}
+
+//fix to get rid of gSavedSettings use - rkeast
+bool LLInventoryFilter::getPartialSearch()
+{
+	return mPartialSearch;
+}
+
+//fix to get rid of gSavedSettings use - rkeast
+void LLInventoryFilter::setSearchType(U32 type)
+{
+	mSearchType = type;
+}
+
+//fix to get rid of gSavedSettings use - rkeast
+U32 LLInventoryFilter::getSearchType()
+{
+	return mSearchType;
+}
+
 void LLInventoryFilter::setFilterTypes(U32 types)
 {
 	if (mFilterOps.mFilterTypes != types)