diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
commit | 551d17f819ea3dbcdc61cb41a458ab6d893d28cf (patch) | |
tree | 130c90ed3b0f6a4245af843cf9170130d549dc4f /indra/newview/llviewermedia.cpp | |
parent | 99fe1004a6cb4406bcac790420a5be6269e02723 (diff) | |
parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) |
merge latest changes (post-2.7.0) from viewer-development
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index bc326540e6..79c6c8db75 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -914,7 +914,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) // Set the low priority size for downsampling to approximately the size the texture is displayed at. { - F32 approximate_interest_dimension = fsqrtf(pimpl->getInterest()); + F32 approximate_interest_dimension = (F32) sqrt(pimpl->getInterest()); pimpl->setLowPrioritySizeLimit(llround(approximate_interest_dimension)); } |