livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
leyla_linden 2010-12-21 17:02:25 -08:00
parent 6175e8147f 8bca21e23b
commit ce595b5663
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llviewerassetstats.cpp
View File

@ -531,7 +531,7 @@ asset_type_to_category(const LLViewerAssetType::EType at, bool with_http, bool i
// - gestures
// - everything else.
//
llassert_always(26 == LLViewerAssetType::AT_COUNT);
llassert_always(50 == LLViewerAssetType::AT_COUNT);
// Multiple asset definitions are floating around so this requires some
// maintenance and attention.
@ -563,9 +563,7 @@ asset_type_to_category(const LLViewerAssetType::EType at, bool with_http, bool i
LLViewerAssetStats::EVACOtherGet, // AT_FAVORITE
LLViewerAssetStats::EVACOtherGet, // AT_LINK
LLViewerAssetStats::EVACOtherGet, // AT_LINK_FOLDER
#if 0
// When LLViewerAssetType::AT_COUNT == 49
LLViewerAssetStats::EVACOtherGet, // AT_FOLDER_ENSEMBLE_START
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
@ -584,11 +582,12 @@ asset_type_to_category(const LLViewerAssetType::EType at, bool with_http, bool i
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, // AT_FOLDER_ENSEMBLE_END
LLViewerAssetStats::EVACOtherGet, // AT_CURRENT_OUTFIT
LLViewerAssetStats::EVACOtherGet, // AT_OUTFIT
LLViewerAssetStats::EVACOtherGet // AT_MY_OUTFITS
#endif
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, //
LLViewerAssetStats::EVACOtherGet, // AT_MESH
// (50)
};
if (at < 0 || at >= LLViewerAssetType::AT_COUNT)