summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-12 17:35:31 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-12 17:35:31 -0500
commite47ff7bd4748202ff4e6a33bd78b84288d1d1ec8 (patch)
tree6cb278f935742abaa61773b4a4eedd2fde2de13d /indra/newview
parentfdf19a526821291bd3d6a6e1f6b78dcaeac63705 (diff)
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.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp15
-rw-r--r--indra/newview/llfloatermodelpreview.h1
2 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 3ac7f12e4e..8dcb441b16 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -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())
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 04e5b9591c..3747abedd1 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -279,7 +279,6 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex
void rebuildUploadData();
void clearIncompatible(S32 lod);
void updateStatusMessages();
- bool containsRiggedAsset( void );
void clearGLODGroup();