diff options
| author | simon <none@none> | 2014-05-07 10:56:41 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 10:56:41 -0700 |
| commit | 250db74bf9325acdc1169f6c13d297e7fe44b753 (patch) | |
| tree | c6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/llui/lltabcontainer.cpp | |
| parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull and merge viewer-release as version 3.7.8
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 2b9286f663..ebc6183b8b 100755 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -407,7 +407,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) @@ -1585,7 +1585,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; } |