Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'liru/Release'

Browse Source
This commit is contained in:
Shyotl
2017-11-18 11:09:40 -06:00
parent 77ebb91d37 4e6eaa2849
commit 1271eeb808
2 changed files with 83 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
indra/newview/llfloaterreporter.cpp
View File

@@ -215,15 +215,12 @@ LLFloaterReporter::~LLFloaterReporter()
// virtual // virtual
void LLFloaterReporter::draw() void LLFloaterReporter::draw()
{ {
getChildView("screen_check")->setEnabled(TRUE );
LLFloater::draw(); LLFloater::draw();
} }
void LLFloaterReporter::enableControls(BOOL enable) void LLFloaterReporter::enableControls(BOOL enable)
{ {
getChildView("category_combo")->setEnabled(enable); getChildView("category_combo")->setEnabled(enable);
getChildView("screen_check")->setEnabled(enable);
getChildView("screenshot")->setEnabled(false); getChildView("screenshot")->setEnabled(false);
getChildView("pick_btn")->setEnabled(enable); getChildView("pick_btn")->setEnabled(enable);
getChildView("summary_edit")->setEnabled(enable); getChildView("summary_edit")->setEnabled(enable);
@@ -391,19 +388,10 @@ void LLFloaterReporter::onClickSend(void *userdata)
} }
else else
{ {
if(self->getChild<LLUICtrl>("screen_check")->getValue()) self->getChildView("send_btn")->setEnabled(FALSE);
{ self->getChildView("cancel_btn")->setEnabled(FALSE);
self->getChildView("send_btn")->setEnabled(FALSE); // the callback from uploading the image calls sendReportViaLegacy()
self->getChildView("cancel_btn")->setEnabled(FALSE); self->uploadImage();
// the callback from uploading the image calls sendReportViaLegacy()
self->uploadImage();
}
else
{
self->sendReportViaLegacy(self->gatherReport());
LLUploadDialog::modalUploadFinished();
self->close();
}
} }
} }
} }
@@ -648,20 +636,12 @@ LLSD LLFloaterReporter::gatherReport()
gGLManager.mGLRenderer.c_str(), gGLManager.mGLRenderer.c_str(),
gGLManager.mDriverVersionVendorString.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<LLUICtrl>("screen_check")->getValue())
{
screenshot_id = getChild<LLUICtrl>("screenshot")->getValue();
}
LLSD report = LLSD::emptyMap(); LLSD report = LLSD::emptyMap();
report["report-type"] = (U8) mReportType; report["report-type"] = (U8) mReportType;
report["category"] = getChild<LLUICtrl>("category_combo")->getValue(); report["category"] = getChild<LLUICtrl>("category_combo")->getValue();
report["position"] = mPosition.getValue(); report["position"] = mPosition.getValue();
report["check-flags"] = (U8)0; // this is not used report["check-flags"] = (U8)0; // this is not used
report["screenshot-id"] = screenshot_id; report["screenshot-id"] = getChild<LLUICtrl>("screenshot")->getValue();
report["object-id"] = mObjectID; report["object-id"] = mObjectID;
report["abuser-id"] = mAbuserID; report["abuser-id"] = mAbuserID;
report["abuse-region-name"] = ""; report["abuse-region-name"] = "";
@@ -745,7 +725,7 @@ private:
void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report) void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report)
{ {
if(getChild<LLUICtrl>("screen_check")->getValue().asBoolean() && !sshot_url.empty()) if(!sshot_url.empty())
{ {
// try to upload screenshot // try to upload screenshot
LLHTTPClient::post(sshot_url, report, new LLUserReportScreenshotResponder(report, LLHTTPClient::post(sshot_url, report, new LLUserReportScreenshotResponder(report,

165
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -9,7 +9,7 @@
follows="left|top" height="114" label="" left="238" mouse_opaque="true" follows="left|top" height="114" label="" left="238" mouse_opaque="true"
name="screenshot" width="134" /> name="screenshot" width="134" />
<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Include screenshot" left="13" initial_value="true" visible="false" label="Include screenshot" left="13"
mouse_opaque="true" name="screen_check" width="116" /> mouse_opaque="true" name="screen_check" width="116" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-48" drop_shadow_visible="true" follows="left|top" bottom="-48" drop_shadow_visible="true" follows="left|top"
@@ -85,93 +85,82 @@
name="category_combo" name="category_combo"
tool_tip="Category -- select the category that best describes this report" tool_tip="Category -- select the category that best describes this report"
width="356"> width="356">
<combo_item name="Select_category" value="0"> <combo_box.item
Select category label="Select category"
</combo_item><combo_item name="Age__Age_play" value="31"> name="Select_category"
Age > Age play value="0" />
</combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32"> <combo_box.item
Age > Adult resident on Teen Second Life label="Age &gt; Age play"
</combo_item><combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33"> name="Age__Age_play"
Age > Underage resident outside of Teen Second Life value="31" />
</combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34"> <combo_box.item
Assault > Combat sandbox / unsafe area label="Assault &gt; Shooting, pushing, or shoving another Resident in a Safe Area"
</combo_item><combo_item name="Assault__Safe_area" value="35"> name="Assault__Safe_area"
Assault > Safe area value="35" />
</combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36"> <combo_box.item
Assault > Weapons testing sandbox label="Disclosure &gt; Real world information"
</combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38"> name="Disclosure__Real_world_information"
Commerce > Failure to deliver product or service value="39" />
</combo_item><combo_item name="Disclosure__Real_world_information" value="39"> <combo_box.item
Disclosure > Real world information label="Disturbing the peace &gt; Excessive scripted objects"
</combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40"> name="Disturbing_the_peace__Excessive_scripted_objects"
Disclosure > Remotely monitoring chat value="43" />
</combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41"> <combo_box.item
Disclosure > Second Life information/chat/IMs label="Disturbing the peace &gt; Object littering"
</combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42"> name="Disturbing_the_peace__Object_littering"
Disturbing the peace > Unfair use of region resources value="44" />
</combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43"> <combo_box.item
Disturbing the peace > Excessive scripted objects label="Disturbing the peace &gt; Repetitive spam"
</combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44"> name="Disturbing_the_peace__Repetitive_spam"
Disturbing the peace > Object littering value="45" />
</combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45"> <combo_box.item
Disturbing the peace > Repetitive spam label="Fraud &gt; L$ or USD $"
</combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46"> name="Fraud__US$"
Disturbing the peace > Unwanted advert spam value="50" />
</combo_item><combo_item name="Fraud__L$" value="47"> <combo_box.item
Fraud > L$ name="Ridiculous3"
</combo_item><combo_item name="Fraud__Land" value="48"> label="Freud &gt; User has taken an interest in their mother"
Fraud > Land value="100" />
</combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49"> <combo_box.item
Fraud > Pyramid scheme or chain letter label="Harassment &gt; Targeted behavior intended to disrupt"
</combo_item><combo_item name="Fraud__US$" value="50"> name="Harassment__Solicting_inciting_others_to_violate_ToS"
Fraud > US$ value="55" />
</combo_item><combo_item name="Ridiculous3" value="100"> <combo_box.item
Freud > User has taken an interest in their mother label="Harassment &gt; User keeps licking finger and touching me"
</combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51"> name="Ridiculous1"
Harassment > Advert farms / visual spam value="100"/>
</combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52"> <combo_box.item
Harassment > Defaming individuals or groups label="Indecency &gt; Broadly offensive content or conduct"
</combo_item><combo_item name="Harassment__Impeding_movement" value="53"> name="Indecency__Broadly_offensive_content_or_conduct"
Harassment > Impeding movement value="57" />
</combo_item><combo_item name="Harassment__Sexual_harassment" value="54"> <combo_box.item
Harassment > Sexual harassment label="Indecency &gt; Inappropriate avatar name"
</combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55"> name="Indecency__Inappropriate_avatar_name"
Harassment > Solicting/inciting others to violate ToS value="59" />
</combo_item><combo_item name="Harassment__Verbal_abuse" value="56"> <combo_box.item
Harassment > Verbal abuse label="Indecency &gt; Inappropriate content or conduct for Region Rating"
</combo_item><combo_item name="Ridiculous1" value="100"> name="Indecency__Mature_content_in_PG_region"
Harassment > User keeps licking finger and touching me value="60" />
</combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57"> <combo_box.item
Indecency > Broadly offensive content or conduct label="Intolerance"
<!-- 58 = deprecated by AO --> name="Intolerance"
</combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59"> value="61" />
Indecency > Inappropriate avatar name <combo_box.item
</combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60"> label="Land &gt; Encroachment &gt; Objects or textures"
Indecency > Inappropriate content or conduct in a PG region name="Land__Encroachment__Objects_textures"
</combo_item><combo_item name="Indecency__Inappropriate_content_in_Mature_region" value="69"> value="63" />
Indecency > Inappropriate content or conduct in a Mature region <combo_box.item
</combo_item><combo_item name="Intellectual_property_infringement_Content_Removal" value="66"> name="Ridiculous2"
Intellectual property infringement > Content Removal label="Land &gt; Encroachment &gt; User won't stay on their side of the car"
</combo_item><combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37"> value="100" />
Intellectual property infringement > CopyBot or Permissions Exploit <combo_box.item
</combo_item><combo_item name="Intolerance" value="61"> label="Gaming Policy Violation"
Intolerance name="Wagering_gambling"
</combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62"> value="67" />
Land > Abuse of sandbox resources <combo_box.item
</combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63"> label="Other"
Land > Encroachment > Objects/textures name="Other"
</combo_item><combo_item name="Land__Encroachment__Particles" value="64"> value="68" />
Land > Encroachment > Particles
</combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
Land > Encroachment > Trees/plants
</combo_item><combo_item name="Ridiculous2" value="100">
Land > Encroachment > User won't stay on their side of the car
</combo_item><combo_item name="Wagering_gambling" value="67">
Wagering/gambling
</combo_item>
<combo_item name="Other" value="68">
Other
</combo_item>
</combo_box> </combo_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" follows="left|top" bottom_delta="-26" drop_shadow_visible="true" follows="left|top"