diff options
| author | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
| commit | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (patch) | |
| tree | 0be3b5e63506bf30edd3748f9e31740ae9ebbaa8 /indra/llui/lltabcontainer.cpp | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
| parent | a8192fbf60540e42dcff5f1efb8bf8cafbfac484 (diff) | |
merge with release
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rwxr-xr-x | indra/llui/lltabcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 76ba53ec32..65df0e5b80 100755 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -406,7 +406,7 @@ void LLTabContainer::draw() } } - setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLCriticalDamp::getInterpolant(0.08f))); + setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLSmoothInterpolation::getInterpolant(0.08f))); BOOL has_scroll_arrows = !getTabsHidden() && ((mMaxScrollPos > 0) || (mScrollPosPixels > 0)); if (!mIsVertical) @@ -1584,7 +1584,7 @@ BOOL LLTabContainer::selectTabByName(const std::string& name) LLPanel* panel = getPanelByName(name); if (!panel) { - llwarns << "LLTabContainer::selectTabByName(" << name << ") failed" << llendl; + LL_WARNS() << "LLTabContainer::selectTabByName(" << name << ") failed" << LL_ENDL; return FALSE; } |