diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:07:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:07:27 -0400 |
| commit | 8ee8778347a32d4170f2e0be3044e1814e4b5ea8 (patch) | |
| tree | ab494a94d4bcec150fb096a0dd01389711acd8da /indra/newview | |
| parent | d8be66c8e2dc979f7497841cd79fa6bd4172b4c8 (diff) | |
| parent | e647ea2ef4620d137d75552bfa47f5e7ee93bf60 (diff) | |
merge changes for MAINT-7466
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterbvhpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp index 5f606ec326..ae7620f2c7 100644 --- a/indra/newview/llfloaterbvhpreview.cpp +++ b/indra/newview/llfloaterbvhpreview.cpp @@ -293,7 +293,7 @@ BOOL LLFloaterBvhPreview::postBuild() loaderp->serialize(dp); dp.reset(); LL_INFOS("BVH") << "Deserializing motionp" << LL_ENDL; - BOOL success = motionp && motionp->deserialize(dp); + BOOL success = motionp && motionp->deserialize(dp, mMotionID); LL_INFOS("BVH") << "Done" << LL_ENDL; delete []buffer; |