diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-11-22 10:26:25 -0800 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-11-22 10:26:25 -0800 |
| commit | f98a622325d8982d32ae98e189f5d3ec6ada183f (patch) | |
| tree | 9930c7e29ba4fc3dd26548f06fa2a16eaedfcb0a /indra/newview/tests/llviewerassetstats_test.cpp | |
| parent | a99db82e9b3ce25bf2745721b57f0259a770b26a (diff) | |
ESC-154 ESC-156 Metrics integration into viewer's threads
Removed declared but undefined interfaces from LLTextureFetch family.
Had inserted the cross-thread command processor into some of
LLTextureFetchWorker's processing which was unnatural and
probably wrong. Moved it to LLTextureFetch which turned out to
be far, far more natural. Better documentation on the asLLSD()
format. Refined LLSD stats merger logic and enhanced unit
tests to verify same.
Diffstat (limited to 'indra/newview/tests/llviewerassetstats_test.cpp')
| -rw-r--r-- | indra/newview/tests/llviewerassetstats_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp index e8cde5fc5d..a44712e8ad 100644 --- a/indra/newview/tests/llviewerassetstats_test.cpp +++ b/indra/newview/tests/llviewerassetstats_test.cpp @@ -492,7 +492,7 @@ namespace tut dst["regions"][reg2_name] = reg2_stats; dst["duration"] = 36; - LLViewerAssetStats::mergeLLSD(src, dst); + LLViewerAssetStats::mergeRegionsLLSD(src, dst); ensure("region 1 in merged stats", llsd_equals(reg1_stats, dst["regions"][reg1_name])); ensure("region 2 still in merged stats", llsd_equals(reg2_stats, dst["regions"][reg2_name])); @@ -507,7 +507,7 @@ namespace tut dst["regions"][reg1_name] = reg2_stats; dst["duration"] = 36; - LLViewerAssetStats::mergeLLSD(src, dst); + LLViewerAssetStats::mergeRegionsLLSD(src, dst); ensure("src not ruined", llsd_equals(reg1_stats, src["regions"][reg1_name])); ensure_equals("added enqueued counts", dst["regions"][reg1_name]["get_other"]["enqueued"].asInteger(), 12); |