diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
| commit | a98b4b6bee1b062722ce5eb03948a0fd33b74265 (patch) | |
| tree | 88c030cef0c480f19ab9ff0a187b5c866da3a24a /indra/newview/llworldmapview.cpp | |
| parent | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
merge changes for 3.7.7-release
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
| -rwxr-xr-x | indra/newview/llworldmapview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 786e4f2de6..a770352f86 100755 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -302,8 +302,8 @@ void LLWorldMapView::draw() mVisibleRegions.clear(); // animate pan if necessary - sPanX = lerp(sPanX, sTargetPanX, LLCriticalDamp::getInterpolant(0.1f)); - sPanY = lerp(sPanY, sTargetPanY, LLCriticalDamp::getInterpolant(0.1f)); + sPanX = lerp(sPanX, sTargetPanX, LLSmoothInterpolation::getInterpolant(0.1f)); + sPanY = lerp(sPanY, sTargetPanY, LLSmoothInterpolation::getInterpolant(0.1f)); const S32 width = getRect().getWidth(); const S32 height = getRect().getHeight(); @@ -1713,7 +1713,7 @@ BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask ) { gViewerWindow->setCursor( UI_CURSOR_CROSS ); } - lldebugst(LLERR_USER_INPUT) << "hover handled by LLWorldMapView" << llendl; + LL_DEBUGS("UserInput") << "hover handled by LLWorldMapView" << LL_ENDL; return TRUE; } } |