summaryrefslogtreecommitdiff
path: root/indra/newview/lltextureinfo.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-14 11:51:49 -0700
committerRichard Linden <none@none>2013-08-14 11:51:49 -0700
commit26581404e426b00cd0a07c38b5cb858d5d5faa28 (patch)
treef2a9a512fac56b7ce4f5f643617346e05c0a2992 /indra/newview/lltextureinfo.cpp
parent9faaa28f4445425e8c5b7b002faffbe0365b905d (diff)
BUILDFIX: added header for numeric_limits support on gcc
added convenience types for units F32Seconds, etc.
Diffstat (limited to 'indra/newview/lltextureinfo.cpp')
-rwxr-xr-xindra/newview/lltextureinfo.cpp8
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
{