diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-21 15:04:25 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-21 15:04:25 -0500 |
| commit | 8bca21e23b1ad857cb707af986c33523c6ea7724 (patch) | |
| tree | 9a868dadcd42f2616d98b60c6b2c983382716454 | |
| parent | 4e98895719d963a72346a7bf59323cdb602f98dd (diff) | |
SH-689 Fix build issue due to assert i llviewerassetstats
Changed assert to 50 since that's the new asset count. Added OTHER metrics for mesh and dummy asset types.
| -rw-r--r-- | indra/newview/llviewerassetstats.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp index 5ad7725b3e..9d98302210 100644 --- a/indra/newview/llviewerassetstats.cpp +++ b/indra/newview/llviewerassetstats.cpp @@ -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) |