1 files changed, 25 insertions, 43 deletions

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index f7c82621fb..faf7ed0d8c 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -60,8 +60,13 @@ LLPanelSnapshot* LLFloaterSnapshot::Impl::getActivePanel(LLFloaterSnapshotBase*
 {
     LLSideTrayPanelContainer* panel_container = floater->getChild<LLSideTrayPanelContainer>("panel_container");
     LLPanelSnapshot* active_panel = dynamic_cast<LLPanelSnapshot*>(panel_container->getCurrentPanel());
+
     if (!ok_if_not_found)
     {
+        if (!active_panel)
+        {
+            LL_WARNS() << "No snapshot active panel, current panel index: " << panel_container->getCurrentPanelIndex() << LL_ENDL;
+        }
         llassert_always(active_panel != NULL);
     }
     return active_panel;
@@ -324,7 +329,6 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshotBase* floater)
     bool got_bytes = previewp && previewp->getDataSize() > 0;
     bool got_snap = previewp && previewp->getSnapshotUpToDate();
 
-    // *TODO: Separate maximum size for Web images from postcards
     LL_DEBUGS() << "Is snapshot up-to-date? " << got_snap << LL_ENDL;
 
     LLLocale locale(LLLocale::USER_LOCALE);
@@ -343,7 +347,8 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshotBase* floater)
         image_res_tb->setTextArg("[HEIGHT]", llformat("%d", previewp->getEncodedImageHeight()));
     }
 
-    floater->getChild<LLUICtrl>("file_size_label")->setTextArg("[SIZE]", got_snap ? bytes_string : floater->getString("unknown"));
+    LLTextBox* file_size_label = floater->getChild<LLTextBox>("file_size_label");
+    file_size_label->setTextArg("[SIZE]", got_snap ? bytes_string : floater->getString("unknown"));
 
     LLUIColor color = LLUIColorTable::instance().getColor( "LabelTextColor" );
     if (shot_type == LLSnapshotModel::SNAPSHOT_POSTCARD
@@ -359,7 +364,8 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshotBase* floater)
         color = LLUIColor(LLColor4::red);
     }
 
-    floater->getChild<LLUICtrl>("file_size_label")->setColor(color);
+    file_size_label->setColor(color);
+    file_size_label->setReadOnlyColor(color); // field gets disabled during upload
 
     // Update the width and height spinners based on the corresponding resolution combos. (?)
     switch(shot_type)
@@ -511,34 +517,13 @@ void LLFloaterSnapshotBase::ImplBase::onClickFilter(LLUICtrl *ctrl, void* data)
 }
 
 // static
-void LLFloaterSnapshotBase::ImplBase::onClickUICheck(LLUICtrl *ctrl, void* data)
+void LLFloaterSnapshotBase::ImplBase::onClickDisplaySetting(LLUICtrl* ctrl, void* data)
 {
-    LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
-    gSavedSettings.setBOOL( "RenderUIInSnapshot", check->get() );
-
-    LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
+    LLFloaterSnapshot* view = (LLFloaterSnapshot*)data;
     if (view)
     {
         LLSnapshotLivePreview* previewp = view->getPreviewView();
-        if(previewp)
-        {
-            previewp->updateSnapshot(true, true);
-        }
-        view->impl->updateControls(view);
-    }
-}
-
-// static
-void LLFloaterSnapshotBase::ImplBase::onClickHUDCheck(LLUICtrl *ctrl, void* data)
-{
-    LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
-    gSavedSettings.setBOOL( "RenderHUDInSnapshot", check->get() );
-
-    LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
-    if (view)
-    {
-        LLSnapshotLivePreview* previewp = view->getPreviewView();
-        if(previewp)
+        if (previewp)
         {
             previewp->updateSnapshot(true, true);
         }
@@ -642,20 +627,18 @@ void LLFloaterSnapshotBase::ImplBase::setWorking(bool working)
     working_lbl->setVisible(working);
     mFloater->getChild<LLUICtrl>("working_indicator")->setVisible(working);
 
-    if (working)
-    {
-        const std::string panel_name = getActivePanel(mFloater, false)->getName();
-        const std::string prefix = panel_name.substr(getSnapshotPanelPrefix().size());
-        std::string progress_text = mFloater->getString(prefix + "_" + "progress_str");
-        working_lbl->setValue(progress_text);
-    }
-
     // All controls should be disabled while posting.
     mFloater->setCtrlsEnabled(!working);
-    LLPanelSnapshot* active_panel = getActivePanel(mFloater);
-    if (active_panel)
+    if (LLPanelSnapshot* active_panel = getActivePanel(mFloater))
     {
         active_panel->enableControls(!working);
+        if (working)
+        {
+            const std::string panel_name = active_panel->getName();
+            const std::string prefix = panel_name.substr(getSnapshotPanelPrefix().size());
+            std::string progress_text = mFloater->getString(prefix + "_" + "progress_str");
+            working_lbl->setValue(progress_text);
+        }
     }
 }
 
@@ -999,11 +982,9 @@ bool LLFloaterSnapshot::postBuild()
     mSucceessLblPanel = getChild<LLUICtrl>("succeeded_panel");
     mFailureLblPanel = getChild<LLUICtrl>("failed_panel");
 
-    childSetCommitCallback("ui_check", ImplBase::onClickUICheck, this);
-    getChild<LLUICtrl>("ui_check")->setValue(gSavedSettings.getBOOL("RenderUIInSnapshot"));
-
-    childSetCommitCallback("hud_check", ImplBase::onClickHUDCheck, this);
-    getChild<LLUICtrl>("hud_check")->setValue(gSavedSettings.getBOOL("RenderHUDInSnapshot"));
+    childSetCommitCallback("ui_check", ImplBase::onClickDisplaySetting, this);
+    childSetCommitCallback("balance_check", ImplBase::onClickDisplaySetting, this);
+    childSetCommitCallback("hud_check", ImplBase::onClickDisplaySetting, this);
 
     ((Impl*)impl)->setAspectRatioCheckboxValue(this, gSavedSettings.getBOOL("KeepAspectForSnapshot"));
 
@@ -1296,7 +1277,8 @@ bool LLFloaterSnapshotBase::ImplBase::updatePreviewList(bool initialized)
 
 void LLFloaterSnapshotBase::ImplBase::updateLivePreview()
 {
-    if (ImplBase::updatePreviewList(true) && mFloater)
+    // don't update preview for hidden floater
+    if (mFloater && mFloater->isInVisibleChain() && ImplBase::updatePreviewList(true))
     {
         LL_DEBUGS() << "changed" << LL_ENDL;
         updateControls(mFloater);