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

ER-910 cleanup: removed a stale comment, tweaked text in About Land dialog 

Options tab.
meow-7.2.2
simon@lindenlab.com 2011-07-08 15:41:55 -07:00
parent 1cf5ce3a43
commit bef014ad2a
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterland.cpp
View File

@ -1972,7 +1972,7 @@ void LLPanelLandOptions::refresh()
mPushRestrictionCtrl->set(FALSE);
mPushRestrictionCtrl->setEnabled(FALSE);
mSeeAvatarsCtrl->set(TRUE); // NOTE - reversed FALSE/TRUE for 'see avatars' prototype
mSeeAvatarsCtrl->set(TRUE);
mSeeAvatarsCtrl->setEnabled(FALSE);
mLandingTypeCombo->setCurrentByIndex(0);

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

@ -1207,8 +1207,7 @@ Only large parcels can be listed in search.
</panel.string>
<panel.string
name="see_avs_text">
Allow avatars on other parcels to see
and chat with avatars on this parcel
See and chat with residents on this parcel
</panel.string>
<text
type="string"
@ -1516,14 +1515,27 @@ Only large parcels can be listed in search.
fallback_image="default_land_picture.j2c"
tool_tip="Click to choose a picture"
width="195" />
<check_box
height="32"
label="See Avatars"
<text
type="string"
length="1"
follows="left|top"
text_color="white"
height="16"
layout="topleft"
left="230"
top="174"
name="allow_label5"
width="278">
Allow Residents on other parcels to:
</text>
<check_box
height="16"
label="See Avatars"
follows="top"
layout="topleft"
left="230"
top="164"
name="SeeAvatarsCheck"
tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them."
tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them."
width="120" />
<text
type="string"