diff options
author | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
commit | 56af97063aaa35c1a70f5edaf47f4a015600860d (patch) | |
tree | 299b113fab1ff7176c86342aa3e881491cd3b883 /indra/llcommon/llevents.cpp | |
parent | b679975d8fdc22d33d0f62288934be8f0209157e (diff) | |
parent | 681c5de92bd09622de360818682240b0a17403f7 (diff) |
Pull from vir/drano
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. |