From 2e652ce660e86097ce2b47bb82926005bb0482c8 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Thu, 8 Sep 2011 15:54:52 -0400
Subject: Fix for SH-2210

---
 indra/newview/llfloatermodelpreview.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index b424ad45fb..42186aa247 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2764,6 +2764,7 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement )
 
 	//process children
 	daeTArray< daeSmartRef<daeElement> > children = element->getChildren();
+	int childCount = children.getCount();
 	for (S32 i = 0; i < children.getCount(); i++)
 	{
 		processElement(children[i],badElement);
@@ -3456,6 +3457,12 @@ void LLModelPreview::setPhysicsFromLOD(S32 lod)
 
 void LLModelPreview::clearIncompatible(S32 lod)
 {
+	//Don't discard models if specified model is the physic rep
+	if ( lod == LLModel::LOD_PHYSICS )
+	{
+		return;
+	}
+
 	for (U32 i = 0; i <= LLModel::LOD_HIGH; i++)
 	{ //clear out any entries that aren't compatible with this model
 		if (i != lod)
-- 
cgit v1.2.3