From 7c27fd2037bc49cf4169db31e9dd1e4612c53ef8 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Mon, 28 Mar 2011 13:12:47 -0700 Subject: fixing unused LLComboBox issue that was causing mac/linux breakage --- indra/newview/llfloatermodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloatermodelpreview.cpp') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 254f9f8a5e..e6ff25bcff 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -4523,7 +4523,7 @@ void LLModelPreview::setPreviewLOD(S32 lod) combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order LLComboBox* combo_box3 = mFMP->getChild("preview_lod_combo3"); - combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order + combo_box3->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order LLColor4 highlight_color = LLUIColorTable::instance().getColor("MeshImportTableHighlightColor"); LLColor4 normal_color = LLUIColorTable::instance().getColor("MeshImportTableNormalColor"); -- cgit v1.2.3 From 7c993e449067a70e8008f97595c2ddb9a916c86d Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Mon, 28 Mar 2011 13:16:34 -0700 Subject: fixing line endings in llfloatermodelpreview.cpp --- indra/newview/llfloatermodelpreview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloatermodelpreview.cpp') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index d7a285c666..68373981df 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2492,7 +2492,7 @@ U32 LLModelPreview::calcResourceCost() F32 debug_scale = mFMP ? mFMP->childGetValue("import_scale").asReal() : 1.f; mPelvisZOffset = mFMP ? mFMP->childGetValue("pelvis_offset").asReal() : 3.0f; - + if ( mFMP && mFMP->childGetValue("upload_joints").asBoolean() ) { gAgentAvatarp->setPelvisOffset( mPelvisZOffset ); -- cgit v1.2.3