livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for SH-1177 - Allowable range for an alternate pivot is -64 to 64

meow-7.2.2
prep 2011-03-30 14:05:23 -04:00
parent 73bf43b593
commit dd71a9faac
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloatermodelpreview.cpp
View File

@ -111,6 +111,8 @@ const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
const S32 PREF_BUTTON_HEIGHT = 16 + 7 + 16;
const S32 PREVIEW_TEXTURE_HEIGHT = 300;
const F32 MAXIMUM_PIVOT_OFFSET = 64.0f;
void drawBoxOutline(const LLVector3& pos, const LLVector3& size);
@ -1913,8 +1915,19 @@ void LLModelLoader::handlePivotPoint( daeElement* pRoot )
if ( pTranslate )
{
extractTranslation( pTranslate, workingTransform );
mPreview->setModelPivot( workingTransform.getTranslation() );
mPreview->setHasPivot( true );
LLVector3 pivotTrans = workingTransform.getTranslation();
if ( pivotTrans[VX] > MAXIMUM_PIVOT_OFFSET || pivotTrans[VX] < -MAXIMUM_PIVOT_OFFSET ||
pivotTrans[VY] > MAXIMUM_PIVOT_OFFSET || pivotTrans[VY] < -MAXIMUM_PIVOT_OFFSET ||
pivotTrans[VZ] > MAXIMUM_PIVOT_OFFSET || pivotTrans[VZ] < -MAXIMUM_PIVOT_OFFSET )
{
llwarns<<"Asset Pivot Node contains an offset that is too large - values should be within (-"<<MAXIMUM_PIVOT_OFFSET<<","<<MAXIMUM_PIVOT_OFFSET<<")."<<llendl;
mPreview->setHasPivot( false );
}
else
{
mPreview->setModelPivot( pivotTrans );
mPreview->setHasPivot( true );
}
}
}
}