diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-25 16:52:50 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-25 16:52:50 -0700 |
| commit | de89e384544176f2e10225481ca2b0e7901167fb (patch) | |
| tree | ffacc3b8a422b7d816b7f462cdfaa249c40dd867 | |
| parent | e6e8bf172cb399fa94ddd6f45efcf58947eaf0e8 (diff) | |
| parent | 21379da780d975dd8a159b3459249d387bc2d023 (diff) | |
Pull merge from lindenlab/viewer-fbc
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index c9f7283640..9e7b131abf 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -138,6 +138,7 @@ BOOL LLSocialPhotoPanel::postBuild() LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p); mPreviewHandle = previewp->getHandle(); + previewp->setSnapshotType(previewp->SNAPSHOT_WEB); previewp->setThumbnailPlaceholderRect(getThumbnailPlaceholderRect()); return LLPanel::postBuild(); @@ -263,6 +264,7 @@ void LLSocialPhotoPanel::updateControls() LLSnapshotLivePreview* previewp = getPreviewView(); BOOL got_bytes = previewp && previewp->getDataSize() > 0; BOOL got_snap = previewp && previewp->getSnapshotUpToDate(); + LLSnapshotLivePreview::ESnapshotType shot_type = previewp->getSnapshotType(); // *TODO: Separate maximum size for Web images from postcards lldebugs << "Is snapshot up-to-date? " << got_snap << llendl; @@ -277,7 +279,7 @@ void LLSocialPhotoPanel::updateControls() //getChild<LLUICtrl>("file_size_label")->setTextArg("[SIZE]", got_snap ? bytes_string : getString("unknown")); getChild<LLUICtrl>("file_size_label")->setTextArg("[SIZE]", got_snap ? bytes_string : "unknown"); getChild<LLUICtrl>("file_size_label")->setColor( - true + shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_bytes && previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLUIColor(LLColor4::red) : LLUIColorTable::instance().getColor( "LabelTextColor" )); |