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

merge

meow-7.2.2
Brad Payne (Vir Linden) 2011-07-15 14:10:38 -04:00
parent fde88ae24d a89c58f01b
commit 0e22915352
3 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llagent.cpp
View File

@ -577,7 +577,10 @@ void LLAgent::setFlying(BOOL fly)
// static
void LLAgent::toggleFlying()
{
LLToolPie::instance().stopClickToWalk();
if ( gAgent.mAutoPilot )
{
LLToolPie::instance().stopClickToWalk();
}
BOOL fly = !gAgent.getFlying();

44
indra/newview/llfloatermodelpreview.cpp
View File

@ -1385,6 +1385,8 @@ bool LLModelLoader::doLoadModel()
if (!dom)
{
llinfos<<" Error with dae - traditionally indicates a corrupt file."<<llendl;
setLoadState( ERROR_PARSING );
return false;
}
@ -2185,15 +2187,11 @@ void LLModelPreview::critiqueRigForUploadApplicability( const std::vector<std::s
setRigValidForJointPositionUpload( true );
}
if ( isRigLegacyOK )
{
if ( isRigLegacyOK)
{
setLegacyRigValid( true );
}
if ( getRigWithSceneParity() && isJointPositionUploadOK )
{
setResetJointFlag( true );
}
}
//-----------------------------------------------------------------------------
// critiqueJointToNodeMappingFromScene()
@ -2233,12 +2231,7 @@ void LLModelPreview::critiqueJointToNodeMappingFromScene( void )
//2. Partial rig but w/o parity between the scene and joint array
if ( result )
{
setResetJointFlag( true );
setRigWithSceneParity( true );
}
else
{
setResetJointFlag( false );
}
}
//-----------------------------------------------------------------------------
@ -2996,13 +2989,7 @@ U32 LLModelPreview::calcResourceCost()
if ( uploadingJointPositions && !isRigValidForJointPositionUpload() )
{
mFMP->childDisable("ok_btn");
}
else
if ( !isLegacyRigValid() )
{
mFMP->childDisable("ok_btn");
}
//ok_btn should not have been changed unless something was wrong with joint list
}
}
std::set<LLModel*> accounted;
@ -3343,6 +3330,7 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
if ( getLoadState() >= LLModelLoader::ERROR_PARSING )
{
mFMP->childDisable("ok_btn");
mFMP->childDisable( "calculate_btn" );
}
if (lod == mPreviewLOD)
@ -4213,12 +4201,7 @@ void LLModelPreview::updateStatusMessages()
if ( uploadingJointPositions && !isRigValidForJointPositionUpload() )
{
skinAndRigOk = false;
}
else
if ( !isLegacyRigValid() )
{
skinAndRigOk = false;
}
}
}
if(upload_ok && mModelLoader)
@ -4814,8 +4797,12 @@ BOOL LLModelPreview::render()
mFMP->childSetValue("upload_joints", false);
upload_joints = false;
}
mFMP->childSetEnabled("upload_joints", upload_skin);
//Only enable joint offsets if it passed the earlier critiquing
if ( isRigValidForJointPositionUpload() )
{
mFMP->childSetEnabled("upload_joints", upload_skin);
}
F32 explode = mFMP->childGetValue("physics_explode").asReal();
@ -5475,11 +5462,6 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
{
mCalculateBtn->setVisible( false );
}
else
if ( !mModelPreview->isLegacyRigValid() )
{
mCalculateBtn->setVisible( false );
}
}
mUploadBtn->setVisible(!visible);

3
indra/newview/llfloatermodelpreview.h
View File

@ -365,9 +365,6 @@ public:
void setLoadState( U32 state ) { mLoadState = state; }
U32 getLoadState() { return mLoadState; }
//setRestJointFlag: If an asset comes through that changes the joints, we want the reset to persist
void setResetJointFlag( bool state ) { if ( !mResetJoints ) mResetJoints = state; }
const bool getResetJointFlag( void ) const { return mResetJoints; }
void setRigWithSceneParity( bool state ) { mRigParityWithScene = state; }
const bool getRigWithSceneParity( void ) const { return mRigParityWithScene; }