summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-07-20 18:42:48 -0700
committerRichard Nelson <none@none>2010-07-20 18:42:48 -0700
commit76a7df57ea572fbc877d0e335483993e33fb214f (patch)
tree2608bd81997f0e5dc041080f1fcf6cc987f805f0 /indra/newview
parent3dbe2837d9660c50c8db34f5131bd9258940b3c6 (diff)
parent20ce01811e3a5565a27de150e4658e996bac3108 (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterland.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml6
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 913bb676b0..f0ed659f5a 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -2088,7 +2088,8 @@ void LLPanelLandOptions::refresh()
LLStyle::Params style;
style.image(LLUI::getUIImage(gFloaterView->getParentFloater(this)->getString("maturity_icon_moderate")));
LLCheckBoxWithTBAcess* fullaccess_mature_ctrl = (LLCheckBoxWithTBAcess*)mMatureCtrl;
- fullaccess_mature_ctrl->getTextBox()->setText(std::string("icon"),style);
+ fullaccess_mature_ctrl->getTextBox()->setText(LLStringExplicit(""));
+ fullaccess_mature_ctrl->getTextBox()->appendImageSegment(style);
fullaccess_mature_ctrl->getTextBox()->appendText(getString("mature_check_mature"), false);
fullaccess_mature_ctrl->setToolTip(getString("mature_check_mature_tooltip"));
fullaccess_mature_ctrl->reshape(fullaccess_mature_ctrl->getRect().getWidth(), fullaccess_mature_ctrl->getRect().getHeight(), FALSE);
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 68e36ff0b3..8d32097c3b 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1467,13 +1467,15 @@ Only large parcels can be listed in search.
</combo_box>
<check_box
height="16"
- label="Moderate Content"
+ label="Moderate Contentxxxxxxx"
layout="topleft"
left="14"
name="MatureCheck"
top="177"
+ label_text.valign="center"
+ label_text.v_pad="-5"
tool_tip=" "
- width="107" />
+ width="200" />
<text
type="string"
length="1"