diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-12-20 02:21:04 +0200 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-12-20 02:21:04 +0200 |
| commit | 4193f9da922fd42ff6acb811c1bf302decbc6750 (patch) | |
| tree | 8ee139fd8276ebfd0f3775678b5b82b6f905c9e5 | |
| parent | 7869b9a73d7df71764ddbc247ab1a684190e247b (diff) | |
Fix of build issues after merge
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index ff71d52138..80c6ff4a96 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -1286,7 +1286,9 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do LLJoint* pJoint = mJointLookupFunc(lookingForJoint,mOpaqueData); if ( pJoint ) { - pJoint->storeCurrentXform( jointTransform.getTranslation() ); + LLUUID fake_mesh_id; + fake_mesh_id.generate(); + pJoint->addAttachmentPosOverride( jointTransform.getTranslation(), fake_mesh_id, ""); } else { diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index efe8b6c266..27c2a1ed42 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1151,9 +1151,6 @@ void LLFloaterModelPreview::onMouseCaptureLostModelPreview(LLMouseHandler* handl } //----------------------------------------------------------------------------- - LLUUID fake_mesh_id; - fake_mesh_id.generate(); - pJoint->addAttachmentPosOverride( jointTransform.getTranslation(), fake_mesh_id, gAgentAvatarp->avString()); // LLModelPreview //----------------------------------------------------------------------------- |