summaryrefslogtreecommitdiff
path: root/indra/llcommon/llevents.cpp
diff options
context:
space:
mode:
authorprep <none@none>2012-03-13 15:48:24 -0400
committerprep <none@none>2012-03-13 15:48:24 -0400
commitfab57eea612f34ed9d8c8559674ead1760aab42b (patch)
tree51394d44e1b89bb75d168464aec539f60f44f8cd /indra/llcommon/llevents.cpp
parent87b414c4934d0d52eef0b323245568bb1e95ec70 (diff)
parent00717147d2b832fa3239267edf409f0a1dfcd9fd (diff)
pull and merge from viewer-development
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.