diff options
author | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-16 12:39:11 -0700 |
commit | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (patch) | |
tree | c0042514f1242d58cea031be84c23d493f39bb6a /indra/newview/llinspect.cpp | |
parent | 52640b85c497e8b0a900ff3f1e051021b5485277 (diff) | |
parent | 25937040de9a787c221aae7f178f43827c799028 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llinspect.cpp')
-rwxr-xr-x | indra/newview/llinspect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp index 14382e82d7..e6cb068613 100755 --- a/indra/newview/llinspect.cpp +++ b/indra/newview/llinspect.cpp @@ -59,7 +59,7 @@ void LLInspect::draw() } else if (mCloseTimer.getStarted()) { - F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 1.f, 0.f); + F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME(), 1.f, 0.f); LLViewDrawContext context(alpha); LLFloater::draw(); if (mCloseTimer.getElapsedTimeF32() > FADE_TIME) |