diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:09:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:09:35 -0400 |
| commit | dd0c04b8648a2cf36a94fa678fad0f55d631d0fc (patch) | |
| tree | 407a599c94044a7add03d8c6662e0209b9ebff62 /indra/newview/llfloatermodelpreview.cpp | |
| parent | dbac37dcb50bf44255c2b622d418bb4339f1afca (diff) | |
| parent | dd5d7fadca40b43a597b1af14d94273286498ab8 (diff) | |
merge changes for storm-1860
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 7448f2bb2a..4b8beba546 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -5053,15 +5053,7 @@ BOOL LLModelPreview::render() LLRect preview_rect; - LLFloaterModelWizard* floater_wizard = dynamic_cast<LLFloaterModelWizard*>(mFMP); - if (floater_wizard) - { - preview_rect = floater_wizard->getPreviewRect(); - } - else - { - preview_rect = mFMP->getChildView("preview_panel")->getRect(); - } + preview_rect = mFMP->getChildView("preview_panel")->getRect(); F32 aspect = (F32) preview_rect.getWidth()/preview_rect.getHeight(); @@ -5605,7 +5597,6 @@ void LLModelPreview::setPreviewLOD(S32 lod) combo_box->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order mFMP->childSetText("lod_file_" + lod_name[mPreviewLOD], mLODFile[mPreviewLOD]); - // the wizard has three lod drop downs LLComboBox* combo_box2 = mFMP->getChild<LLComboBox>("preview_lod_combo2"); combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order |