summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelclassified.cpp13
-rw-r--r--indra/newview/skins/default/xui/en/panel_classified_info.xml53
2 files changed, 45 insertions, 21 deletions
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index d59a7d752e..c4684e9827 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -1299,7 +1299,10 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t
bool mature = is_cf_mature(c_info->flags);
childSetValue("content_type", mature ? mature_str : pg_str);
- childSetValue("auto_renew", is_cf_auto_renew(c_info->flags));
+
+ std::string auto_renew_str = is_cf_auto_renew(c_info->flags) ?
+ getString("auto_renew_on") : getString("auto_renew_off");
+ childSetValue("auto_renew", auto_renew_str);
price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing));
childSetValue("price_for_listing", LLSD(price_str));
@@ -1321,8 +1324,12 @@ void LLPanelClassifiedInfo::resetData()
setClassifiedId(LLUUID::null);
setSnapshotId(LLUUID::null);
mPosGlobal.clearVec();
- childSetValue("category", LLStringUtil::null);
- childSetValue("content_type", LLStringUtil::null);
+ childSetText("category", LLStringUtil::null);
+ childSetText("content_type", LLStringUtil::null);
+ childSetText("click_through_text", LLStringUtil::null);
+ childSetText("price_for_listing", LLStringUtil::null);
+ childSetText("auto_renew", LLStringUtil::null);
+ childSetText("creation_date", LLStringUtil::null);
childSetText("click_through_text", LLStringUtil::null);
}
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 932e34d694..1535ce2978 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -30,6 +30,14 @@
name="date_fmt">
[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
</panel.string>
+ <panel.string
+ name="auto_renew_on">
+ Enabled
+ </panel.string>
+ <panel.string
+ name="auto_renew_off">
+ Disabled
+ </panel.string>
<button
follows="top|right"
height="23"
@@ -127,7 +135,7 @@
bg_visible="false"
follows="left|top"
h_pad="0"
- height="25"
+ height="30"
layout="topleft"
left="10"
name="classified_location"
@@ -246,21 +254,21 @@
animate="false"
name="descr_stack"
layout="topleft"
- follows="top|left"
+ follows="all"
orientation="vertical"
left="10"
top_pad="5"
width="290"
- height="250">
+ height="215">
<layout_panel
auto_resize="false"
name="clickthrough_layout_panel"
layout="topleft"
- follows="top|left"
+ follows="all"
left="0"
top="0"
width="290"
- height="26"
+ height="16"
user_resize="false">
<text
follows="left|top"
@@ -294,28 +302,37 @@
auto_resize="false"
name="price_layout_panel"
layout="topleft"
- follows="top|left"
+ follows="all"
left="0"
top="0"
width="290"
- height="26"
+ height="16"
user_resize="false">
- <check_box
- enabled="false"
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="10"
+ layout="topleft"
+ left="0"
+ name="auto_renew_label"
+ text_color="white"
+ top="0"
+ value="Auto renew:"
+ width="140" />
+ <text
height="16"
- label="Auto renew each week"
layout="topleft"
follows="top|left"
- left="0"
+ left_pad="0"
name="auto_renew"
- top="0"
- v_pad="0"
- width="290" />
+ top_pad="-10"
+ value="Enabled"
+ width="150" />
</layout_panel>
<layout_panel
name="descr_layout_panel"
layout="topleft"
- follows="top|left"
+ follows="all"
left="0"
top="0"
width="290"
@@ -337,7 +354,7 @@
allow_html="true"
allow_scroll="true"
bg_visible="false"
- follows="left|top|right"
+ follows="all"
h_pad="0"
height="200"
layout="topleft"
@@ -345,8 +362,8 @@
max_length="1023"
name="classified_desc"
read_only="true"
- top_pad="5"
- width="290"
+ top_pad="7"
+ width="280"
v_pad="0"
value="[description]"
word_wrap="true" />