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

MAINT-4939 FIXED Remove Abuse Report Pop-Up Dialog

andreykproductengine 2015-03-04 15:55:23 +02:00
parent 5220b0903c
commit 04817c499f
4 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloaterreporter.cpp
View File

@ -108,14 +108,6 @@ LLFloaterReporter::LLFloaterReporter(const LLSD& key)
{
}
// static
void LLFloaterReporter::processRegionInfo(LLMessageSystem* msg)
{
if ( LLFloaterReg::instanceVisible("reporter") )
{
LLNotificationsUtil::add("HelpReportAbuseEmailLL");
};
}
// virtual
BOOL LLFloaterReporter::postBuild()
{
@ -149,16 +141,6 @@ BOOL LLFloaterReporter::postBuild()
mDefaultSummary = getChild<LLUICtrl>("details_edit")->getValue().asString();
// send a message and ask for information about this region -
// result comes back in processRegionInfo(..)
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("RequestRegionInfo");
msg->nextBlock("AgentData");
msg->addUUID("AgentID", gAgent.getID());
msg->addUUID("SessionID", gAgent.getSessionID());
gAgent.sendReliableMessage();
// abuser name is selected from a list
LLUICtrl* le = getChild<LLUICtrl>("abuser_name_edit");
le->setEnabled( false );

5
indra/newview/llfloaterreporter.h
View File

@ -99,10 +99,7 @@ public:
static void uploadDoneCallback(const LLUUID &uuid, void* user_data, S32 result, LLExtStat ext_status);
static void addDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
static void setDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
// static
static void processRegionInfo(LLMessageSystem* msg);
void setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id);
private:

1
indra/newview/llviewerregion.cpp
View File

@ -829,7 +829,6 @@ void LLViewerRegion::processRegionInfo(LLMessageSystem* msg, void**)
LLRegionInfoModel::instance().update(msg);
LLFloaterGodTools::processRegionInfo(msg);
LLFloaterRegionInfo::processRegionInfo(msg);
LLFloaterReporter::processRegionInfo(msg);
}
void LLViewerRegion::setCacheID(const LLUUID& id)

11
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5379,17 +5379,6 @@ You cannot undo this action.
notext="Cancel"
yestext="Unlink"/>
</notification>
<notification
icon="alertmodal.tga"
name="HelpReportAbuseEmailLL"
type="alert">
<unique/>
Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
All reported abuses are investigated and resolved.
</notification>
<notification
icon="alertmodal.tga"