diff options
| author | Richard Linden <none@none> | 2014-03-12 12:48:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-03-12 12:48:43 -0700 |
| commit | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (patch) | |
| tree | 438dd649dbcc0584709251c6926a476b0db02f85 /indra/newview/llinspect.cpp | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
| parent | 5f513242890068f569df7e50a5ac0ba3bdd23f05 (diff) | |
merge with release
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) |