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

merge changes for storm-1788

meow-7.2.2
Oz Linden 2012-01-23 14:14:57 -05:00
parent 79f1cd0a73 7bc4085eb2
commit 37e04247d9
4 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -607,6 +607,7 @@ Jonathan Yap
STORM-1737
STORM-1733
STORM-1790
STORM-1788
Kadah Coba
STORM-1060
Jondan Lundquist

21
indra/newview/llfloaterland.cpp
View File

@ -2475,27 +2475,6 @@ void LLPanelLandAccess::refresh()
mListBanned->addNameItem(entry.mID, ADD_DEFAULT, TRUE, suffix);
}
}
LLCheckBoxWithTBAcess* maturity_checkbox = (LLCheckBoxWithTBAcess*) getChild<LLCheckBoxCtrl>( "public_access");
LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
if(region)
{
LLTextBox* maturity_textbox = maturity_checkbox->getTextBox();
insert_maturity_into_textbox(maturity_textbox, gFloaterView->getParentFloater(this), getString("allow_public_access"));
maturity_checkbox->reshape(maturity_checkbox->getRect().getWidth(), maturity_checkbox->getRect().getHeight(), FALSE);
}
else
{
std::string maturity_string = getString("allow_public_access");
size_t maturity_pos = maturity_string.find(MATURITY);
if (maturity_pos != std::string::npos)
{
maturity_string.replace(maturity_pos, MATURITY.length(), std::string(""));
}
maturity_checkbox->setLabel(maturity_string);
}
if(parcel->getRegionDenyAnonymousOverride())
{

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

@ -1955,36 +1955,18 @@ Only large parcels can be listed in search.
name="access_estate_defined">
(Defined by the Estate)
</panel.string>
<panel.string
name="allow_public_access">
Allow Public Access ([MATURITY]) (Note: Unchecking this will create ban lines)
</panel.string>
<panel.string
name="estate_override">
One or more of these options is set at the estate level
</panel.string>
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left="10"
name="Limit access to this parcel to:"
text_color="White"
top="10"
width="400">
Access To This Parcel
</text>
<check_box
follows="top|left"
height="16"
layout="topleft"
left_delta="0"
left="8"
name="public_access"
top_pad="5"
label_text.valign="center"
label_text.v_pad="-2"
label="Allow Public Access (Unchecking this will create ban lines)"
top_pad="10"
width="278" />
<text
type="string"
@ -1994,28 +1976,28 @@ Only large parcels can be listed in search.
layout="topleft"
left_delta="20"
name="Only Allow"
top="49"
top="30"
width="325">
Restrict Access to Residents verified by:
Allow access only to Residents who:
</text>
<check_box
follows="top|left"
height="16"
label="Payment Information on File [ESTATE_PAYMENT_LIMIT]"
label="Have payment Information on File [ESTATE_PAYMENT_LIMIT]"
layout="topleft"
left_delta="0"
name="limit_payment"
tool_tip="Ban unidentified Residents."
tool_tip="Residents must have payment information on file to access this parcel. See the [SUPPORT_SITE] for more information."
top_pad="4"
width="278" />
<check_box
follows="top|left"
height="16"
label="Age Verification [ESTATE_AGE_LIMIT]"
label="Have been age-verified [ESTATE_AGE_LIMIT]"
layout="topleft"
left_delta="0"
name="limit_age_verified"
tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
tool_tip="Residents must be age verified to access this parcel. See the [SUPPORT_SITE] for more information."
top_pad="4"
width="278" />
<check_box
@ -2025,7 +2007,7 @@ Only large parcels can be listed in search.
left="8"
name="GroupCheck"
tool_tip="Set group in the General tab."
top="109"
top="89"
width="278" />
<check_box
enabled="false"

10
indra/newview/skins/default/xui/en/panel_region_estate.xml
View File

@ -134,26 +134,26 @@
name="Only Allow"
top_delta="-30"
width="278">
Restrict Access to accounts verified by:
Allow access only to Residents who:
</text>
<check_box
follows="top|left"
height="16"
label="Payment Information on File"
label="Have payment information on file"
layout="topleft"
left_delta="0"
name="limit_payment"
tool_tip="Ban unidentified Residents"
tool_tip="Residents must have payment information on file to access this estate. See the [SUPPORT_SITE] for more information."
top_pad="2"
width="278" />
<check_box
follows="top|left"
height="16"
label="Age Verification"
label="Have been age-verified"
layout="topleft"
left_delta="0"
name="limit_age_verified"
tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
tool_tip="Residents must be age verified to access this estate. See the [SUPPORT_SITE] for more information."
top_pad="2"
width="278" />