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

FIRE-15368: Don't include floater in screenshot update for abuse report floater

Ansariel 2015-01-12 21:56:01 +01:00
parent caa3e5acd4
commit 846150b937
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloaterreporter.cpp
View File

@ -179,7 +179,7 @@ BOOL LLFloaterReporter::postBuild()
getChild<LLUICtrl>("reporter_field")->setValue(reporter);
// <FS:Ansariel> FIRE-15218: Refresh screenshot button
getChild<LLButton>("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::takeScreenshot, this));
getChild<LLButton>("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::onUpdateScreenshot, this));
center();
@ -867,6 +867,15 @@ void LLFloaterReporter::setPosBox(const LLVector3d &pos)
getChild<LLUICtrl>("pos_field")->setValue(pos_string);
}
// <FS:Ansariel> FIRE-15368: Don't include floater in screenshot update
void LLFloaterReporter::onUpdateScreenshot()
{
setVisible(FALSE);
takeScreenshot();
setVisible(TRUE);
}
// </FS:Ansariel>
// void LLFloaterReporter::setDescription(const std::string& description, LLMeanCollisionData *mcd)
// {
// LLFloaterReporter *self = LLFloaterReg::findTypedInstance<LLFloaterReporter>("reporter");

2
indra/newview/llfloaterreporter.h
View File

@ -122,6 +122,8 @@ private:
void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
void setFromAvatarID(const LLUUID& avatar_id);
void onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name);
// <FS:Ansariel> FIRE-15368: Don't include floater in screenshot update
void onUpdateScreenshot();
private:
EReportType mReportType;