livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull merge from lindenlab/viewer-fbc

meow-7.2.2
Merov Linden 2013-06-25 16:52:50 -07:00
parent e6e8bf172c 21379da780
commit de89e38454
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatersocial.cpp
View File

@ -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" ));