summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-03-13 17:13:45 -0500
committerDave Parks <davep@lindenlab.com>2013-03-13 17:13:45 -0500
commit9a7a19c77ad1b143c7acfa915af7887e417253f1 (patch)
treef1fa5386449233e69b022c508d6a508eb73e38ae /indra/llui/llmenugl.cpp
parent08ae21f52dbbe6245ac8deee0fdfd5df4d3dba53 (diff)
parentbba84a3fa9a1af87f6a8080f9093f9277feb1292 (diff)
Merge
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r--indra/llui/llmenugl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index cd6cc6a75e..f142be885d 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -3673,7 +3673,7 @@ void LLTearOffMenu::draw()
if (getRect().getHeight() != mTargetHeight)
{
// animate towards target height
- reshape(getRect().getWidth(), llceil(lerp((F32)getRect().getHeight(), mTargetHeight, LLCriticalDamp::getInterpolant(0.05f))));
+ reshape(getRect().getWidth(), llceil(lerp((F32)getRect().getHeight(), mTargetHeight, LLCriticalDamp::getInterpolant(InterpDeltaTeeny))));
}
LLFloater::draw();
}