summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiranV <NiranV.Dean@googlemail.com>2014-08-15 18:35:00 +0200
committerNiranV <NiranV.Dean@googlemail.com>2014-08-15 18:35:00 +0200
commite8d3a37f91296f1551b53ce5d5c26333fe2e2666 (patch)
tree63050adf2c6d38f93b7b5a099ed2ae2a19d249fd
parentea79b23e85a4e526b222582a585a55d490724e87 (diff)
BUG-7020: Fixed: Snapshot floater being resized while it's minimized.
-rwxr-xr-xindra/newview/llfloatersnapshot.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index f927b50092..55dfad37d8 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -287,7 +287,10 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
thumbnail_placeholder->reshape(panel_width, thumbnail_placeholder->getRect().getHeight());
floaterp->getChild<LLUICtrl>("image_res_text")->setVisible(advanced);
floaterp->getChild<LLUICtrl>("file_size_label")->setVisible(advanced);
- floaterp->reshape(floater_width, floaterp->getRect().getHeight());
+ if(!floaterp->isMinimized())
+ {
+ floaterp->reshape(floater_width, floaterp->getRect().getHeight());
+ }
bool use_freeze_frame = floaterp->getChild<LLUICtrl>("freeze_frame_check")->getValue().asBoolean();