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

DEV-44138 About Land - Access tab - make AO overriden options clear

master
Soft Linden 2009-12-10 20:39:31 -06:00
parent 47c68ba226
commit e9a744131d
5 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/llregionflags.h
View File

@ -92,7 +92,7 @@ const U32 REGION_FLAGS_DENY_ANONYMOUS = (1 << 23);
const U32 REGION_FLAGS_ALLOW_PARCEL_CHANGES = (1 << 26);
const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
// const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27); // We no longer support ELAR
const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);

20
indra/newview/llfloaterland.cpp
View File

@ -2300,7 +2300,7 @@ void LLPanelLandAccess::refresh()
mListBanned->deleteAllItems();
LLParcel *parcel = mParcel->getParcel();
// Display options
if (parcel)
{
@ -2396,22 +2396,40 @@ void LLPanelLandAccess::refresh()
mListBanned->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
}
}
LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
if(region)
{
std::string region_access = "(";
region_access += region->getSimAccessString();
region_access += ")";
childSetLabelArg( "public_access", "[MATURITY]", region_access );
}
else
{
childSetLabelArg( "public_access", "[MATURITY]", std::string() );
}
if(parcel->getRegionDenyAnonymousOverride())
{
childSetValue("limit_payment", TRUE);
childSetLabelArg( "limit_payment", "[ESTATE_PAYMENT_LIMIT]", getString("access_estate_defined") );
}
else
{
childSetValue("limit_payment", (parcel->getParcelFlag(PF_DENY_ANONYMOUS)));
childSetLabelArg( "limit_payment", "[ESTATE_PAYMENT_LIMIT]", std::string() );
}
if(parcel->getRegionDenyAgeUnverifiedOverride())
{
childSetValue("limit_age_verified", TRUE);
childSetLabelArg( "limit_age_verified", "[ESTATE_AGE_LIMIT]", getString("access_estate_defined") );
}
else
{
childSetValue("limit_age_verified", (parcel->getParcelFlag(PF_DENY_AGEUNVERIFIED)));
childSetLabelArg( "limit_age_verified", "[ESTATE_AGE_LIMIT]", std::string() );
}
BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST);

23
indra/newview/llfloaterreporter.cpp
View File

@ -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<LLFloaterReporter>("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();

1
indra/newview/llfloaterreporter.h
View File

@ -124,7 +124,6 @@ private:
private:
EReportType mReportType;
BOOL mEmailToEstateOwner;
LLUUID mObjectID;
LLUUID mScreenID;
LLUUID mAbuserID;

12
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -1857,6 +1857,10 @@ Select the thumbnail to choose a different texture.
top="0"
help_topic="land_access_tab"
name="land_access_panel">
<panel.string
name="access_estate_defined">
(Defined by the Estate)
</panel.string>
<panel.string
name="estate_override">
One or more of these options is set at the estate level
@ -1877,7 +1881,7 @@ Select the thumbnail to choose a different texture.
<check_box
follows="top|left"
height="16"
label="Allow Public Access"
label="Allow Public Access [MATURITY]"
layout="topleft"
left_delta="0"
name="public_access"
@ -1893,12 +1897,12 @@ Select the thumbnail to choose a different texture.
name="Only Allow"
top="49"
width="278">
Block Access By:
Restrict Access to Residents verified by:
</text>
<check_box
follows="top|left"
height="16"
label="Residents who have not given payment info to Linden Lab"
label="Payment Information on File [ESTATE_PAYMENT_LIMIT]"
layout="topleft"
left_delta="0"
name="limit_payment"
@ -1908,7 +1912,7 @@ Select the thumbnail to choose a different texture.
<check_box
follows="top|left"
height="16"
label="Residents who are not age verified adults"
label="Age Verification [ESTATE_AGE_LIMIT]"
layout="topleft"
left_delta="0"
name="limit_age_verified"