diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-13 17:13:45 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-13 17:13:45 -0500 |
| commit | 9a7a19c77ad1b143c7acfa915af7887e417253f1 (patch) | |
| tree | f1fa5386449233e69b022c508d6a508eb73e38ae /indra/newview/llworldmapview.cpp | |
| parent | 08ae21f52dbbe6245ac8deee0fdfd5df4d3dba53 (diff) | |
| parent | bba84a3fa9a1af87f6a8080f9093f9277feb1292 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index ccc513b80d..7c3bc5988c 100644 --- 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, LLCriticalDamp::getInterpolant(InterpDeltaSmaller)); + sPanY = lerp(sPanY, sTargetPanY, LLCriticalDamp::getInterpolant(InterpDeltaSmaller)); const S32 width = getRect().getWidth(); const S32 height = getRect().getHeight(); @@ -1795,3 +1795,5 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask ) } return FALSE; } + + |