diff options
| author | Richard Linden <none@none> | 2013-08-14 16:10:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-14 16:10:17 -0700 |
| commit | bceb1e8abe916cd69e7ac6ab70dc03dc6d76c9df (patch) | |
| tree | 0016163049097d6b55a065b8fafdc609f1879c54 /indra/newview/lltextureinfo.cpp | |
| parent | 52086d4485e004999d097cb66fb5cf63e34203d2 (diff) | |
| parent | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/lltextureinfo.cpp')
| -rwxr-xr-x | indra/newview/lltextureinfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltextureinfo.cpp b/indra/newview/lltextureinfo.cpp index cd6e7ff464..9dee92bf12 100755 --- a/indra/newview/lltextureinfo.cpp +++ b/indra/newview/lltextureinfo.cpp @@ -219,11 +219,11 @@ void LLTextureInfo::resetTextureStatistics() mCurrentStatsBundleStartTime = LLTimer::getTotalTime(); } -LLUnit<U32, LLUnits::Microseconds> LLTextureInfo::getRequestStartTime(const LLUUID& id) +LLUnits::U32Microseconds LLTextureInfo::getRequestStartTime(const LLUUID& id) { if (!has(id)) { - return 0; + return LLUnits::U32Microseconds(0); } else { @@ -236,7 +236,7 @@ LLUnit<U32, LLUnits::Bytes> LLTextureInfo::getRequestSize(const LLUUID& id) { if (!has(id)) { - return 0; + return LLUnits::U32Bytes(0); } else { @@ -275,7 +275,7 @@ LLUnit<U32, LLUnits::Microseconds> LLTextureInfo::getRequestCompleteTime(const L { if (!has(id)) { - return 0; + return LLUnits::U32Microseconds(0); } else { |