diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-02-11 09:20:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-02-11 09:20:58 -0500 |
| commit | b0c255f4e6141246f3575cb3d5b671af19966de9 (patch) | |
| tree | f8a9443aac39846ff2df333a0460fd84bb56f484 | |
| parent | 493a34aa15d4ebab4282c3011af89ef3ff3ab0d7 (diff) | |
| parent | 61dde956305035f631d51b988a72bd80e8c2593d (diff) | |
merge up to 3.7.0-release and get unit test fixes
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/test/llsdmessagebuilder_tut.cpp | 2 | ||||
| -rwxr-xr-x | indra/test/lltemplatemessagebuilder_tut.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 0035d4f597..cdecbd2c08 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -662,6 +662,7 @@ Jonathan Yap STORM-1858 STORM-1862 STORM-1918 + STORM-1915 STORM-1953 OPEN-161 Kadah Coba diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp index be0692557a..b7283f53a6 100755 --- a/indra/test/llsdmessagebuilder_tut.cpp +++ b/indra/test/llsdmessagebuilder_tut.cpp @@ -649,7 +649,7 @@ namespace tut template<> template<> void LLSDMessageBuilderTestObject::test<37>() { - LLQuaternion data(1,2,3,0); + LLQuaternion data(0.3713907f, 0.5570861f, 0.7427813f,0.0f); //we send a quaternion packed into a vec3 (w is infered) - so sizeof(vec) == 12 bytes not 16. LLVector3 vec = data.packToVector3(); diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 6c0b70edd2..ff66eb88c1 100755 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -320,7 +320,7 @@ namespace tut { LLMessageTemplate messageTemplate = defaultTemplate(); messageTemplate.addBlock(defaultBlock(MVT_LLQuaternion, 12)); - LLQuaternion outValue, inValue = LLQuaternion(1,2,3,0); + LLQuaternion outValue, inValue = LLQuaternion(0.3713907f, 0.5570861f, 0.7427813f,0.0f); LLTemplateMessageBuilder* builder = defaultBuilder(messageTemplate); builder->addQuat(_PREHASH_Test0, inValue); LLTemplateMessageReader* reader = setReader(messageTemplate, builder); @@ -787,7 +787,7 @@ namespace tut { LLMessageTemplate messageTemplate = defaultTemplate(); messageTemplate.addBlock(defaultBlock(MVT_LLQuaternion, 12)); - LLQuaternion outValue, inValue = LLQuaternion(1,2,3,0); + LLQuaternion outValue, inValue = LLQuaternion(0.3713907f, 0.5570861f, 0.7427813f,0.0f); LLTemplateMessageBuilder* builder = defaultBuilder(messageTemplate); builder->addQuat(_PREHASH_Test0, inValue); LLTemplateMessageReader* reader = setReader( |