diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-12 14:20:33 +0100 | 
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-12 14:20:33 +0100 | 
| commit | a49a4e84a03adb63e4cb4a7ee3ad9202b3aa5361 (patch) | |
| tree | 3a40fed04a9c698eb3f7ad1894abf53ecd665d66 | |
| parent | 1666591946566bb9127aaaf913062678d82859ef (diff) | |
Fix a bunch of typos in new enums, one of which was causing a build failure.
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llwearableitemslist.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llwearableitemslist.h | 20 | 
3 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index c567f006a9..cfd31b6829 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -553,7 +553,7 @@ BOOL LLPanelOutfitEdit::postBuild()  	 *  - each LLWearableType::EType by name (EXT-8205)  	*/  	mWearableListViewItemsComparator = new LLWearableItemTypeNameComparator(); -	mWearableListViewItemsComparator->setOrder(LLAssetType::AT_CLOTHING, LLWearableItemTypeNameComparator::ORDER_RANG_1, false, true); +	mWearableListViewItemsComparator->setOrder(LLAssetType::AT_CLOTHING, LLWearableItemTypeNameComparator::ORDER_RANK_1, false, true);  	mWearablesListViewPanel = getChild<LLPanel>("filtered_wearables_panel");  	mWearableItemsList = getChild<LLWearableItemsList>("list_view"); diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 76ecd28b52..4d916db714 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -478,9 +478,9 @@ LLWearableItemTypeNameComparator::LLWearableItemTypeNameComparator()  	// 1. CLOTHING - sorted by name  	// 2. OBJECT   - sorted by type  	// 3. BODYPART - sorted by name -	mWearableOrder[LLAssetType::AT_CLOTHING] = LLWearableTypeOrder(ORDER_RANG_1, false, false); -	mWearableOrder[LLAssetType::AT_OBJECT]   = LLWearableTypeOrder(ORDER_RANG_2, true, true); -	mWearableOrder[LLAssetType::AT_BODYPART] = LLWearableTypeOrder(ORDER_RANG_3, false, true); +	mWearableOrder[LLAssetType::AT_CLOTHING] = LLWearableTypeOrder(ORDER_RANK_1, false, false); +	mWearableOrder[LLAssetType::AT_OBJECT]   = LLWearableTypeOrder(ORDER_RANK_2, true, true); +	mWearableOrder[LLAssetType::AT_BODYPART] = LLWearableTypeOrder(ORDER_RANK_3, false, true);  }  void LLWearableItemTypeNameComparator::setOrder(LLAssetType::EType items_of_type,  LLWearableItemTypeNameComparator::ETypeListOrder order_priority, bool sort_asset_items_by_name, bool sort_wearable_items_by_name) @@ -555,7 +555,7 @@ LLWearableItemTypeNameComparator::ETypeListOrder LLWearableItemTypeNameComparato  	if(const_it == mWearableOrder.end())  	{  		llwarns<<"Absent information about order rang of items of "<<LLAssetType::getDesc(item_type)<<" type"<<llendl; -		return ORDER_RANG_UNKNOWN; +		return ORDER_RANK_UNKNOWN;  	}  	return const_it->second.mOrderPriority; diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h index 06b449c6e4..b5e64abad0 100644 --- a/indra/newview/llwearableitemslist.h +++ b/indra/newview/llwearableitemslist.h @@ -313,10 +313,10 @@ public:  	enum ETypeListOrder  	{ -		ORDER_RANG_1 = 1, -		ORDER_RANG_2, -		ORDER_RANG_3, -		ORDER_RANG_UNKNOWN +		ORDER_RANK_1 = 1, +		ORDER_RANK_2, +		ORDER_RANK_3, +		ORDER_RANK_UNKNOWN  	};  	void setOrder(LLAssetType::EType items_of_type, ETypeListOrder order_priority, bool sort_items_by_name, bool sort_wearable_items_by_name); @@ -325,15 +325,15 @@ protected:  	/**  	 * All information about sort order is stored in mWearableOrder map  	 * -	 * mWearableOrder :      KEYES              VALUES +	 * mWearableOrder :      KEYS              VALUES  	 *                  [LLAssetType] [struct LLWearableTypeOrder]  	 *  	 *--------------------------------------------------------------------------------------------- -	 * I. Determines order (ORDER_RANG) in which items of LLAssetType should be displayed in list. +	 * I. Determines order (ORDER_RANK) in which items of LLAssetType should be displayed in list.  	 *     For example by spec in MY OUTFITS the order is: -	 *     1. AT_CLOTHING (ORDER_RANG_1) -	 *     2. AT_OBJECT   (ORDER_RANG_2) -	 *     3. AT_BODYPART (ORDER_RANG_3) +	 *     1. AT_CLOTHING (ORDER_RANK_1) +	 *     2. AT_OBJECT   (ORDER_RANK_2) +	 *     3. AT_BODYPART (ORDER_RANK_3)  	 *  	 * II.Items of each type(LLAssetType) are sorted by name or type(LLWearableType)  	 *     For example by spec in MY OUTFITS the order within each items type(LLAssetType) is: @@ -346,7 +346,7 @@ protected:  	 *  	 * For each LLAssetType (KEYS in mWearableOrder) the information about:  	 * -	 *                                             I.  ORDER_RANG (the flag is LLWearableTypeOrder::mOrderPriority) +	 *                                             I.  ORDER_RANK (the flag is LLWearableTypeOrder::mOrderPriority)  	 *  	 *                                             II. whether items of this LLAssetType type should be ordered  	 *                                                 by name or by LLWearableType::EType (the flag is LLWearableTypeOrder::mSortAssetTypeByName)  | 
