From 4aa943b87151a41eb6fcf4cb1cc5ce0a08a74ed1 Mon Sep 17 00:00:00 2001 From: Liru Date: Wed, 1 Nov 2017 18:13:36 -0400 Subject: [PATCH 1/3] XML sync report abuse with upstream --- .../xui/en-us/floater_report_abuse.xml | 165 ++++++++---------- 1 file changed, 77 insertions(+), 88 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml b/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml index 7c1976e04..102954f5b 100644 --- a/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml @@ -9,7 +9,7 @@ follows="left|top" height="114" label="" left="238" mouse_opaque="true" name="screenshot" width="134" /> - - Select category - - Age > Age play - - Age > Adult resident on Teen Second Life - - Age > Underage resident outside of Teen Second Life - - Assault > Combat sandbox / unsafe area - - Assault > Safe area - - Assault > Weapons testing sandbox - - Commerce > Failure to deliver product or service - - Disclosure > Real world information - - Disclosure > Remotely monitoring chat - - Disclosure > Second Life information/chat/IMs - - Disturbing the peace > Unfair use of region resources - - Disturbing the peace > Excessive scripted objects - - Disturbing the peace > Object littering - - Disturbing the peace > Repetitive spam - - Disturbing the peace > Unwanted advert spam - - Fraud > L$ - - Fraud > Land - - Fraud > Pyramid scheme or chain letter - - Fraud > US$ - - Freud > User has taken an interest in their mother - - Harassment > Advert farms / visual spam - - Harassment > Defaming individuals or groups - - Harassment > Impeding movement - - Harassment > Sexual harassment - - Harassment > Solicting/inciting others to violate ToS - - Harassment > Verbal abuse - - Harassment > User keeps licking finger and touching me - - Indecency > Broadly offensive content or conduct - - - Indecency > Inappropriate avatar name - - Indecency > Inappropriate content or conduct in a PG region - - Indecency > Inappropriate content or conduct in a Mature region - - Intellectual property infringement > Content Removal - - Intellectual property infringement > CopyBot or Permissions Exploit - - Intolerance - - Land > Abuse of sandbox resources - - Land > Encroachment > Objects/textures - - Land > Encroachment > Particles - - Land > Encroachment > Trees/plants - - Land > Encroachment > User won't stay on their side of the car - - Wagering/gambling - - - Other - + + + + + + + + + + + + + + + + + + + Date: Wed, 1 Nov 2017 18:14:34 -0400 Subject: [PATCH 2/3] Don't reduce the damn framerate, what's wrong with you?! --- indra/newview/llfloaterreporter.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index bc54b75b1..ca0dd49d8 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -215,8 +215,6 @@ LLFloaterReporter::~LLFloaterReporter() // virtual void LLFloaterReporter::draw() { - getChildView("screen_check")->setEnabled(TRUE ); - LLFloater::draw(); } From 4e6eaa2849595f6a92f5e36d9fcd4e456281e244 Mon Sep 17 00:00:00 2001 From: Liru Date: Wed, 1 Nov 2017 18:15:47 -0400 Subject: [PATCH 3/3] New abuse reports upload the screenshot whenever possible --- indra/newview/llfloaterreporter.cpp | 30 ++++++----------------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index ca0dd49d8..0b175dcfa 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -221,7 +221,6 @@ void LLFloaterReporter::draw() void LLFloaterReporter::enableControls(BOOL enable) { getChildView("category_combo")->setEnabled(enable); - getChildView("screen_check")->setEnabled(enable); getChildView("screenshot")->setEnabled(false); getChildView("pick_btn")->setEnabled(enable); getChildView("summary_edit")->setEnabled(enable); @@ -389,19 +388,10 @@ void LLFloaterReporter::onClickSend(void *userdata) } else { - if(self->getChild("screen_check")->getValue()) - { - self->getChildView("send_btn")->setEnabled(FALSE); - self->getChildView("cancel_btn")->setEnabled(FALSE); - // the callback from uploading the image calls sendReportViaLegacy() - self->uploadImage(); - } - else - { - self->sendReportViaLegacy(self->gatherReport()); - LLUploadDialog::modalUploadFinished(); - self->close(); - } + self->getChildView("send_btn")->setEnabled(FALSE); + self->getChildView("cancel_btn")->setEnabled(FALSE); + // the callback from uploading the image calls sendReportViaLegacy() + self->uploadImage(); } } } @@ -646,20 +636,12 @@ LLSD LLFloaterReporter::gatherReport() gGLManager.mGLRenderer.c_str(), gGLManager.mDriverVersionVendorString.c_str()); - // only send a screenshot ID if we're asked to and the email is - // going to LL - Estate Owners cannot see the screenshot asset - LLUUID screenshot_id = LLUUID::null; - if (getChild("screen_check")->getValue()) - { - screenshot_id = getChild("screenshot")->getValue(); - } - LLSD report = LLSD::emptyMap(); report["report-type"] = (U8) mReportType; report["category"] = getChild("category_combo")->getValue(); report["position"] = mPosition.getValue(); report["check-flags"] = (U8)0; // this is not used - report["screenshot-id"] = screenshot_id; + report["screenshot-id"] = getChild("screenshot")->getValue(); report["object-id"] = mObjectID; report["abuser-id"] = mAbuserID; report["abuse-region-name"] = ""; @@ -743,7 +725,7 @@ private: void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report) { - if(getChild("screen_check")->getValue().asBoolean() && !sshot_url.empty()) + if(!sshot_url.empty()) { // try to upload screenshot LLHTTPClient::post(sshot_url, report, new LLUserReportScreenshotResponder(report,