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

SH-717 Viewer crash on exit after Upload model dialog could not be spawned 

Took out unused function that was seen in crash report from this bug.  No functionality change.
meow-7.2.2
Loren Shih 2011-01-12 17:35:31 -05:00
parent fdf19a5268
commit e47ff7bd47
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloatermodelpreview.cpp
View File

@ -2817,21 +2817,6 @@ void LLModelPreview::clearMaterials()
refresh();
}
bool LLModelPreview::containsRiggedAsset( void )
{
//loop through the models and determine if any of them contained a rigged asset, and if so
//return true.
//This is used to cleanup the joint positions after a preview.
for (LLModelLoader::model_list::iterator iter = mBaseModel.begin(); iter != mBaseModel.end(); ++iter)
{
LLModel* pModel = *iter;
if ( pModel->mAlternateBindMatrix.size() > 0 )
{
return true;
}
}
return false;
}
void LLModelPreview::genLODs(S32 which_lod, U32 decimation)
{
if (mBaseModel.empty())

1
indra/newview/llfloatermodelpreview.h
View File

@ -279,7 +279,6 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex
void rebuildUploadData();
void clearIncompatible(S32 lod);
void updateStatusMessages();
bool containsRiggedAsset( void );
void clearGLODGroup();