diff options
author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/llcommon/llevents.cpp | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon/llevents.cpp')
-rw-r--r-- | indra/llcommon/llevents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp index db1ea4792b..0855180dcd 100644 --- a/indra/llcommon/llevents.cpp +++ b/indra/llcommon/llevents.cpp @@ -430,13 +430,13 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL { // The new node isn't last. Place it between the previous node and // the successor. - newNode = (myprev + mydmi->second)/2.0; + newNode = (myprev + mydmi->second)/2.f; } else { // The new node is last. Bump myprev up to the next integer, add // 1.0 and use that. - newNode = std::ceil(myprev) + 1.0; + newNode = std::ceil(myprev) + 1.f; } // Now that newNode has a value that places it appropriately in mSignal, // connect it. |