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

MAINT-2176 FIXED Maturity icon is added

Mnikolenko ProductEngine 2014-03-17 11:39:22 +02:00
parent 559a0229a1
commit d9a3eb0632
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llpanelplaceprofile.cpp
View File

@ -129,6 +129,7 @@ BOOL LLPanelPlaceProfile::postBuild()
mEstateNameText = getChild<LLTextBox>("estate_name");
mEstateRatingText = getChild<LLTextBox>("estate_rating");
mEstateRatingIcon = getChild<LLIconCtrl>("estate_rating_icon");
mEstateOwnerText = getChild<LLTextBox>("estate_owner");
mCovenantText = getChild<LLTextEditor>("covenant");
@ -201,6 +202,7 @@ void LLPanelPlaceProfile::resetLocation()
mEstateNameText->setValue(loading);
mEstateRatingText->setValue(loading);
mEstateRatingIcon->setValue(loading);
mEstateOwnerText->setValue(loading);
mCovenantText->setValue(loading);
@ -348,6 +350,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
mParcelRatingIcon->setValue(icon_m);
mRegionRatingIcon->setValue(icon_m);
mEstateRatingIcon->setValue(icon_m);
break;
case SIM_ACCESS_ADULT:
@ -355,6 +358,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
mParcelRatingIcon->setValue(icon_r);
mRegionRatingIcon->setValue(icon_r);
mEstateRatingIcon->setValue(icon_r);
break;
default:
@ -362,6 +366,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
mParcelRatingIcon->setValue(icon_pg);
mRegionRatingIcon->setValue(icon_pg);
mEstateRatingIcon->setValue(icon_pg);
}
std::string rating = LLViewerRegion::accessToString(sim_access);

1
indra/newview/llpanelplaceprofile.h
View File

@ -103,6 +103,7 @@ private:
LLTextBox* mEstateNameText;
LLTextBox* mEstateRatingText;
LLIconCtrl* mEstateRatingIcon;
LLTextBox* mEstateOwnerText;
LLTextEditor* mCovenantText;

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

@ -762,11 +762,19 @@
top_pad="5"
value="Rating:"
width="80" />
<icon
follows="top|left"
height="16"
image_name="Parcel_PG_Dark"
layout="topleft"
left_pad="0"
name="estate_rating_icon"
width="18" />
<text
follows="left|top|right"
height="15"
layout="topleft"
left_pad="0"
left_pad="10"
name="estate_rating"
top_delta="0"
width="187" />