diff options
| author | Richard Linden <none@none> | 2013-01-17 20:12:10 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-17 20:12:10 -0800 |
| commit | b030b6b00e8913e025f248c90438919fa691f0f9 (patch) | |
| tree | ec56192a6c008ee6f5beffcaa17d7638c5229c46 /indra/newview | |
| parent | 43a92d01afdb4f1dd4003059b79f87e9687527a1 (diff) | |
| parent | 670d03ceb83b92c9bb98d10bb37fba6f75971a2f (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerassetstats.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp index b4da9521f4..890394dd22 100644 --- a/indra/newview/llviewerassetstats.cpp +++ b/indra/newview/llviewerassetstats.cpp @@ -297,7 +297,7 @@ LLViewerAssetStats::LLViewerAssetStats(const LLViewerAssetStats & src) it->second.makeUnique(); } - LLStopWatchControlsMixin<LLViewerAssetStats>::initTo(src.getPlayState()); + LLStopWatchControlsMixin<LLViewerAssetStats>::setPlayState(src.getPlayState()); } void LLViewerAssetStats::handleStart() |