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/llrender/llimagegl.cpp | |
| parent | 52086d4485e004999d097cb66fb5cf63e34203d2 (diff) | |
| parent | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 1d1beafff8..6a45ebc598 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -249,7 +249,7 @@ void LLImageGL::updateStats(F32 current_time) LLFastTimer t(FTM_IMAGE_UPDATE_STATS); sLastFrameTime = current_time; sBoundTextureMemory = sCurBoundTextureMemory; - sCurBoundTextureMemory = LLUnits::Bytes::fromValue(0); + sCurBoundTextureMemory = LLUnits::S32Bytes(0); } //static |