From 115cd1d4e6a3df55ccac92295167aa631cc926dd Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 11 Dec 2014 13:30:25 -0800 Subject: Fix a couple more ll_round() calls --- indra/llmath/tests/llquaternion_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llmath/tests/llquaternion_test.cpp b/indra/llmath/tests/llquaternion_test.cpp index e69010b2d6..3490829743 100755 --- a/indra/llmath/tests/llquaternion_test.cpp +++ b/indra/llmath/tests/llquaternion_test.cpp @@ -175,10 +175,10 @@ namespace tut void llquat_test_object_t::test<6>() { LLQuaternion quat1(3.0f, 2.0f, 6.0f, 0.0f), quat2(1.0f, 1.0f, 1.0f, 1.0f); - ensure("1. The two values are different", llround(12.000000f, 2) == llround(dot(quat1, quat2), 2)); + ensure("1. The two values are different", ll_round(12.000000f, 2) == ll_round(dot(quat1, quat2), 2)); LLQuaternion quat0(3.0f, 9.334f, 34.5f, 23.0f), quat(34.5f, 23.23f, 2.0f, 45.5f); - ensure("2. The two values are different", llround(1435.828807f, 2) == llround(dot(quat0, quat), 2)); + ensure("2. The two values are different", ll_round(1435.828807f, 2) == ll_round(dot(quat0, quat), 2)); } //test case for LLQuaternion &LLQuaternion::constrain(F32 radians) fn. -- cgit v1.2.3 From 9b453b2f2994ca9b7302f7ce40d1a58f6c25670f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 11 Dec 2014 19:09:11 -0500 Subject: Update viewer to consume boost build 297445 (no fchmodat()) --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index fe4c482ff6..760481be56 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -160,9 +160,9 @@ archive hash - 23f92889da917d0ebe542a77dab951ab + c296845cad075250c1ae2620f175a957 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/Darwin/installer/boost-1.57-darwin-297177.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297445/arch/Darwin/installer/boost-1.57-darwin-297445.tar.bz2 name darwin @@ -172,9 +172,9 @@ archive hash - cf9b03e79742944200ad3ab214b06a07 + fb1537f7ad0b490fcb4f096c15dce9cd url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/Linux/installer/boost-1.57-linux-297177.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297445/arch/Linux/installer/boost-1.57-linux-297445.tar.bz2 name linux @@ -184,9 +184,9 @@ archive hash - 37ea0a0d2e276bdc3aaf7cbf29ad8b1a + 76a607d8a625062b9a63a88b62819894 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297177/arch/CYGWIN/installer/boost-1.57-windows-297177.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297445/arch/CYGWIN/installer/boost-1.57-windows-297445.tar.bz2 name windows -- cgit v1.2.3 From 7ddca3476f5473bec0993a6dd364d6248918d39b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 11 Dec 2014 20:02:55 -0500 Subject: Update viewer to consume colladadom build 297450 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 760481be56..c0c313be39 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -212,9 +212,9 @@ archive hash - 7dfdc5abb5ee54ddb5cf34ff99fbf68e + 66849777a83cb69cec3c06b07da7cd3d url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/Darwin/installer/colladadom-2.3.297187-darwin-297187.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/Darwin/installer/colladadom-2.3.297450-darwin-297450.tar.bz2 name darwin @@ -224,9 +224,9 @@ archive hash - 94323c795f5af2aa7073156731b7f8ac + d627c2a679f3afb8d3e090d42f53cd2e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/Linux/installer/colladadom-2.3.297187-linux-297187.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/Linux/installer/colladadom-2.3.297450-linux-297450.tar.bz2 name linux @@ -236,16 +236,16 @@ archive hash - 904fc9bb513fc07b9d72312fa07d001b + 220897a1893a188aa9d31efb48909878 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297187/arch/CYGWIN/installer/colladadom-2.3.297187-windows-297187.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/CYGWIN/installer/colladadom-2.3.297450-windows-297450.tar.bz2 name windows version - 2.3.297187 + 2.3.297450 curl -- cgit v1.2.3 From 659a8fa0bb193c1d096de9099ba7c399e623a184 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 12 Dec 2014 11:41:13 -0500 Subject: Update viewer to consume googlemock build 297460. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c0c313be39..c59632ed62 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -946,9 +946,9 @@ archive hash - f92fce4768ed687fe980e716af9d601e + 022649e284163b8ee23e3c9a81302fa7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/Darwin/installer/googlemock-1.7.0.297188-darwin-297188.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297460/arch/Darwin/installer/googlemock-1.7.0.297460-darwin-297460.tar.bz2 name darwin @@ -958,9 +958,9 @@ archive hash - aa4da4a2e244be142fa07a097463601b + e08b0e9e269b80b549f6044c4e608fb5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/Linux/installer/googlemock-1.7.0.297188-linux-297188.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297460/arch/Linux/installer/googlemock-1.7.0.297460-linux-297460.tar.bz2 name linux @@ -970,16 +970,16 @@ archive hash - 46c17e436ad7385ff2e195228833c937 + f30de5bf36e8ca8681883fe8fd8e0092 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297188/arch/CYGWIN/installer/googlemock-1.7.0.297188-windows-297188.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/googlemock_3p-update-googlemock/rev/297460/arch/CYGWIN/installer/googlemock-1.7.0.297460-windows-297460.tar.bz2 name windows version - 1.7.0.297188 + 1.7.0.297460 gperftools -- cgit v1.2.3 From ddf0f7a915941aa6679e4192bcd38033706c57ea Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 12 Dec 2014 08:54:34 -0800 Subject: Another round of ll_round() --- indra/llmath/tests/mathmisc_test.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp index 91a2e6c009..b5998f7a82 100755 --- a/indra/llmath/tests/mathmisc_test.cpp +++ b/indra/llmath/tests/mathmisc_test.cpp @@ -139,22 +139,22 @@ namespace tut void math_object::test<9>() { F32 val = 430905.2654f, nearest = 100.f; - val = llround(val, nearest); - ensure("float llround value 1", (430900 == val)); + val = ll_round(val, nearest); + ensure("float ll_round value 1", (430900 == val)); val = -430905.2654f, nearest = 10.f; - val = llround(val, nearest); - ensure("float llround value 1", (-430910 == val)); + val = ll_round(val, nearest); + ensure("float ll_round value 1", (-430910 == val)); } template<> template<> void math_object::test<10>() { F64 val = 430905.2654, nearest = 100.0; - val = llround(val, nearest); - ensure("double llround value 1", (430900 == val)); + val = ll_round(val, nearest); + ensure("double ll_round value 1", (430900 == val)); val = -430905.2654, nearest = 10.0; - val = llround(val, nearest); - ensure("double llround value 1", (-430910.00000 == val)); + val = ll_round(val, nearest); + ensure("double ll_round value 1", (-430910.00000 == val)); } template<> template<> -- cgit v1.2.3