summaryrefslogtreecommitdiff
path: root/indra/llcommon/llevents.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-03-09 12:58:50 -0500
committerOz Linden <oz@lindenlab.com>2012-03-09 12:58:50 -0500
commit633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch)
treedc3261611d5b07282c9a4210d49893be779c7d2a /indra/llcommon/llevents.cpp
parent35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff)
parent1b624f5ea686292652978c72d39e5546efe23d0f (diff)
merge changes for vmrg-225
Diffstat (limited to 'indra/llcommon/llevents.cpp')
-rw-r--r--indra/llcommon/llevents.cpp4
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.