aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:57 -0500
committerJacek Antonelli2008-08-15 23:44:57 -0500
commitda68d3a57ecb27eba5d7efb8ff77d9640c0be65e (patch)
treef2fa2b9ed6e8cf49c8a3cb2a1893c4e5c61916a1 /linden/indra/newview/llpreview.cpp
parentSecond Life viewer sources 1.15.1.3 (diff)
downloadmeta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.zip
meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.gz
meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.bz2
meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.xz
Second Life viewer sources 1.16.0.5
Diffstat (limited to 'linden/indra/newview/llpreview.cpp')
-rw-r--r--linden/indra/newview/llpreview.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 23f31aa..7137f85 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -484,8 +484,11 @@ LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id)
484 484
485void LLPreview::userSetShape(const LLRect& new_rect) 485void LLPreview::userSetShape(const LLRect& new_rect)
486{ 486{
487 userResized(); 487 if(new_rect.getWidth() != mRect.getWidth() || new_rect.getHeight() != mRect.getHeight())
488 LLView::userSetShape(new_rect); 488 {
489 userResized();
490 }
491 LLFloater::userSetShape(new_rect);
489} 492}
490 493
491// 494//
@@ -510,9 +513,12 @@ void LLMultiPreview::open() /*Flawfinder: ignore*/
510 513
511void LLMultiPreview::userSetShape(const LLRect& new_rect) 514void LLMultiPreview::userSetShape(const LLRect& new_rect)
512{ 515{
513 LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel(); 516 if(new_rect.getWidth() != mRect.getWidth() || new_rect.getHeight() != mRect.getHeight())
514 if (frontmost_preview) frontmost_preview->userResized(); 517 {
515 LLView::userSetShape(new_rect); 518 LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
519 if (frontmost_preview) frontmost_preview->userResized();
520 }
521 LLFloater::userSetShape(new_rect);
516} 522}
517 523
518 524