summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelwizard.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2010-12-10 17:05:38 -0800
committerleyla_linden <none@none>2010-12-10 17:05:38 -0800
commit285ba513368c6b692ea2eb5d13b85300c76adbea (patch)
tree97edcc2260d97f7b80c9172338481eb8e2a05503 /indra/newview/llfloatermodelwizard.cpp
parent52686947e2643eaa0f1cda03f33bbf1089d3b46d (diff)
fixed model uploader aspect not updating, text not following resize, and file name not filling in
Diffstat (limited to 'indra/newview/llfloatermodelwizard.cpp')
-rw-r--r--indra/newview/llfloatermodelwizard.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp
index 416501cc8b..79c29ef017 100644
--- a/indra/newview/llfloatermodelwizard.cpp
+++ b/indra/newview/llfloatermodelwizard.cpp
@@ -61,7 +61,6 @@ BOOL LLFloaterModelWizard::postBuild()
mModelPreview = new LLModelPreview(512, 512, this);
mModelPreview->setPreviewTarget(16.f);
- mModelPreview->setAspect((F32) mPreviewRect.getWidth()/mPreviewRect.getHeight());
center();
@@ -75,7 +74,7 @@ void LLFloaterModelWizard::draw()
mModelPreview->update();
- if (mModelPreview)
+ if (mModelPreview && mModelPreview->mModelLoader)
{
gGL.color3f(1.f, 1.f, 1.f);
@@ -97,13 +96,13 @@ void LLFloaterModelWizard::draw()
gGL.begin( LLRender::QUADS );
{
gGL.texCoord2f(0.f, 1.f);
- gGL.vertex2i(mPreviewRect.mLeft, item_rect.mTop);
+ gGL.vertex2i(item_rect.mLeft, item_rect.mTop);
gGL.texCoord2f(0.f, 0.f);
- gGL.vertex2i(mPreviewRect.mLeft, item_rect.mBottom);
+ gGL.vertex2i(item_rect.mLeft, item_rect.mBottom);
gGL.texCoord2f(1.f, 0.f);
- gGL.vertex2i(mPreviewRect.mRight, item_rect.mBottom);
+ gGL.vertex2i(item_rect.mRight, item_rect.mBottom);
gGL.texCoord2f(1.f, 1.f);
- gGL.vertex2i(mPreviewRect.mRight, item_rect.mTop);
+ gGL.vertex2i(item_rect.mRight, item_rect.mTop);
}
gGL.end();