diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-25 23:01:52 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-25 23:01:52 -0800 |
| commit | 6dfcd7fc2bd0f502673c43f1a54cda2a8d74e391 (patch) | |
| tree | ad45a1abd388e6803cf19ca6eaacc596c01d9c23 /indra/newview/llfloaterbigpreview.cpp | |
| parent | d220657d8525ccfa246e0f49904e18cc36458b28 (diff) | |
ACME-1327 : WIP : Added computation of the big preview, allow big preview to be resizable
Diffstat (limited to 'indra/newview/llfloaterbigpreview.cpp')
| -rw-r--r-- | indra/newview/llfloaterbigpreview.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llfloaterbigpreview.cpp b/indra/newview/llfloaterbigpreview.cpp index 84a1523e7c..d5f25d5f95 100644 --- a/indra/newview/llfloaterbigpreview.cpp +++ b/indra/newview/llfloaterbigpreview.cpp @@ -78,7 +78,7 @@ void LLFloaterBigPreview::draw() // Display the preview if one is available // HACK!!! We use the puny thumbnail image for the moment // *TODO : Use the real large preview - if (previewp && previewp->getThumbnailImage()) + if (previewp && previewp->getBigThumbnailImage()) { const LLRect& preview_rect = mPreviewPlaceholder->getRect(); // const S32 thumbnail_w = previewp->getThumbnailWidth(); @@ -93,9 +93,7 @@ void LLFloaterBigPreview::draw() // calc preview offset within the floater rect S32 offset_x = preview_rect.mLeft + local_offset_x; S32 offset_y = preview_rect.mBottom + local_offset_y; - - //llinfos << "Merov : draw, offset x = " << offset_x << ", y = " << offset_y << ", thumbnail w = " << thumbnail_w << ", h = " << thumbnail_h << ", rect w = " << preview_rect.getWidth() << ", h = " << preview_rect.getHeight() << llendl; - + gGL.matrixMode(LLRender::MM_MODELVIEW); // Apply floater transparency to the texture unless the floater is focused. F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); @@ -103,7 +101,7 @@ void LLFloaterBigPreview::draw() gl_draw_scaled_image(offset_x, offset_y, //thumbnail_w, thumbnail_h, preview_rect.getWidth(), preview_rect.getHeight(), - previewp->getThumbnailImage(), color % alpha); + previewp->getBigThumbnailImage(), color % alpha); } } |