diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
| commit | 3c16beedc0d41834f22527aa916bd6c609786587 (patch) | |
| tree | 7a7d2c3d4d5835adaef85179bd1cdcd8e2b954f5 /indra/llcharacter/tests/lljoint_test.cpp | |
| parent | 2337134497fa5103d5baf9a0e790b2f294cd9750 (diff) | |
| parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) | |
Automated merge with lindenlab/viewer64 (itself, merged from viewer-release after bento/5.0 release)
Diffstat (limited to 'indra/llcharacter/tests/lljoint_test.cpp')
| -rw-r--r-- | indra/llcharacter/tests/lljoint_test.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp index da151808f2..617f31b0e4 100644 --- a/indra/llcharacter/tests/lljoint_test.cpp +++ b/indra/llcharacter/tests/lljoint_test.cpp @@ -88,6 +88,7 @@ namespace tut { LLJoint lljoint; LLVector3 vec3(2.3f,30.f,10.f); + // SL-315 lljoint.setPosition(vec3); LLVector3 pos = lljoint.getPosition(); ensure("setPosition()/getPosition() failed ", (vec3 == pos)); @@ -98,6 +99,7 @@ namespace tut { LLJoint lljoint; LLVector3 vec3(2.3f,30.f,10.f); + // SL-315 lljoint.setWorldPosition(vec3); LLVector3 pos = lljoint.getWorldPosition(); ensure("1:setWorldPosition()/getWorldPosition() failed ", (vec3 == pos)); |