From 12f91564e857ba638a2b9604f1990ba620348dc9 Mon Sep 17 00:00:00 2001 From: Soft Linden Date: Thu, 10 Dec 2009 18:46:07 -0600 Subject: DEV-28327 Remove ELAR email field from client --- indra/newview/llfloaterreporter.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'indra/newview/llfloaterreporter.cpp') diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 408303a1e0..24f78a7b95 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -121,14 +121,7 @@ void LLFloaterReporter::processRegionInfo(LLMessageSystem* msg) BOOL email_to_estate_owner = ( region_flags & REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER ); f->mEmailToEstateOwner = email_to_estate_owner; - if ( email_to_estate_owner ) - { - LLNotificationsUtil::add("HelpReportAbuseEmailEO"); - } - else - { - LLNotificationsUtil::add("HelpReportAbuseEmailLL"); - } + LLNotificationsUtil::add("HelpReportAbuseEmailLL"); }; } // virtual -- cgit v1.2.3 From e9a744131d2c08c0c08214624e09f152e52b2731 Mon Sep 17 00:00:00 2001 From: Soft Linden Date: Thu, 10 Dec 2009 20:39:31 -0600 Subject: DEV-44138 About Land - Access tab - make AO overriden options clear --- indra/newview/llfloaterreporter.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'indra/newview/llfloaterreporter.cpp') diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 24f78a7b95..932e49c79b 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -95,7 +95,6 @@ const U32 INCLUDE_SCREENSHOT = 0x01 << 0; LLFloaterReporter::LLFloaterReporter(const LLSD& key) : LLFloater(key), mReportType(COMPLAINT_REPORT), - mEmailToEstateOwner(FALSE), mObjectID(), mScreenID(), mAbuserID(), @@ -117,10 +116,6 @@ void LLFloaterReporter::processRegionInfo(LLMessageSystem* msg) if ( LLFloaterReg::instanceVisible("reporter") ) { - LLFloaterReporter *f = LLFloaterReg::findTypedInstance("reporter"); - BOOL email_to_estate_owner = ( region_flags & REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER ); - f->mEmailToEstateOwner = email_to_estate_owner; - LLNotificationsUtil::add("HelpReportAbuseEmailLL"); }; } @@ -211,17 +206,7 @@ LLFloaterReporter::~LLFloaterReporter() // virtual void LLFloaterReporter::draw() { - // this is set by a static callback sometime after the dialog is created. - // Only disable screenshot for abuse reports to estate owners - if ( mEmailToEstateOwner ) - { - childSetValue("screen_check", FALSE ); - childSetEnabled("screen_check", FALSE ); - } - else - { - childSetEnabled("screen_check", TRUE ); - } + childSetEnabled("screen_check", TRUE ); LLFloater::draw(); } @@ -630,11 +615,7 @@ LLSD LLFloaterReporter::gatherReport() LLUUID screenshot_id = LLUUID::null; if (childGetValue("screen_check")) { - - if ( mEmailToEstateOwner == FALSE ) - { - screenshot_id = childGetValue("screenshot"); - } + screenshot_id = childGetValue("screenshot"); }; LLSD report = LLSD::emptyMap(); -- cgit v1.2.3