Code review fix from davep - use booling or operator and not binary one

Remove unnecessary state check.
Initial dialog work for showing physics cost in upload dialog

3 files changed, 4 insertions, 7 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 2f1ce25511..f96c02d9b7 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2055,6 +2055,7 @@ U32 LLModelPreview::calcResourceCost()
 	F32 debug_scale = mFMP->childGetValue("import_scale").asReal();

 

 	F32 streaming_cost = 0.f;

+	F32 physics_cost = 0.f;

 	for (U32 i = 0; i < mUploadData.size(); ++i)

 	{

 		LLModelInstance& instance = mUploadData[i];

@@ -2109,6 +2110,7 @@ U32 LLModelPreview::calcResourceCost()
 	//mFMP->childSetTextArg(info_name[LLModel::LOD_PHYSICS], "[HULLS]", llformat("%d",num_hulls));

 	//mFMP->childSetTextArg(info_name[LLModel::LOD_PHYSICS], "[POINTS]", llformat("%d",num_points));

 	mFMP->childSetTextArg("streaming cost", "[COST]", llformat("%.3f", streaming_cost));

+	mFMP->childSetTextArg("physics cost", "[COST]", llformat("%.3f", physics_cost));	

 	F32 scale = mFMP->childGetValue("import_scale").asReal()*2.f;

 	mFMP->childSetTextArg("import_dimensions", "[X]", llformat("%.3f", mPreviewScale[0]*scale));

 	mFMP->childSetTextArg("import_dimensions", "[Y]", llformat("%.3f", mPreviewScale[1]*scale));

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3219f662df..471df30bfe 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4384,12 +4384,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 			LLFastTimer t(FTM_VOLUME_GEOM_PARTIAL);

 			LLDrawable* drawablep = *drawable_iter;

 

-			if (drawablep->isDead() || drawablep->isState(LLDrawable::FORCE_INVISIBLE) )

-			{

-				continue;

-			}

-

-			if (drawablep->isState(LLDrawable::REBUILD_ALL))

+			if (!drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) )

 			{

 				LLVOVolume* vobj = drawablep->getVOVolume();

 				vobj->preRebuild();

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 0fdcf486e7..e34636db57 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -69,7 +69,7 @@
       Resource Cost: [COST]
     </text>
     <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">
-      Physics Cost: Unknown
+      Physics Cost: [COST]
     </text>
     <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">
       Upload Fee: N/A