From bbe2daad55777974f10f98b8a8023c7e25fbd6d2 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 2 Mar 2010 11:34:14 +0200 Subject: Fixed normal bug EXT-5856 - "Auto renew each week" checkbox is displayed in the Classified Info from other resident profile. Hide auro_renew checkbox for avatar classifieds and showing for agent classifirds. --HG-- branch : product-engine --- indra/newview/llpanelclassified.cpp | 2 ++ .../skins/default/xui/en/panel_classified_info.xml | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index b4c13da91e..f891a9fba2 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1292,11 +1292,13 @@ void LLPanelClassifiedInfo::resetControls() { childSetEnabled("edit_btn", TRUE); childSetVisible("edit_btn", TRUE); + childSetVisible("auto_renew", TRUE); } else { childSetEnabled("edit_btn", FALSE); childSetVisible("edit_btn", FALSE); + childSetVisible("auto_renew", FALSE); } } 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 34c1923582..903a9689f1 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -136,16 +136,6 @@ top_pad="5" v_pad="0" value="[category]" /> - + Date: Tue, 2 Mar 2010 11:53:00 +0200 Subject: =?UTF-8?q?fixed=20EXT-5693=20=E2=80=9CllDialog=20window=20appears?= =?UTF-8?q?=20out=20of=20viewport=20if=20UI=20scale=20>=201.0=E2=80=9D,=20?= =?UTF-8?q?corrected=20calculation=20of=20allowed=20floater=20rect=20in=20?= =?UTF-8?q?docked=20state;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llscriptfloater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 32fd42aded..eb71cc52c8 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -135,7 +135,7 @@ void LLScriptFloater::setNotificationId(const LLUUID& id) void LLScriptFloater::getAllowedRect(LLRect& rect) { - rect = gViewerWindow->getWorldViewRectRaw(); + rect = gViewerWindow->getWorldViewRectScaled(); } void LLScriptFloater::createForm(const LLUUID& notification_id) -- cgit v1.2.3 From 9c8a8f388ab24c404f19602e156a76ad1a03b841 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 2 Mar 2010 12:03:28 +0200 Subject: Fixed normal bug EXT-5654 - 'More' link doesn't show all text in pick/classified description. Encreased expandable text box max length to match classified description max length. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 + indra/newview/skins/default/xui/en/panel_pick_list_item.xml | 1 + 2 files changed, 2 insertions(+) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 1375eb87d9..996e28c575 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -64,6 +64,7 @@ layout="topleft" left="103" name="description" + textbox.max_length="1024" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 8b25fb5d2a..715dc5f23c 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -64,6 +64,7 @@ layout="topleft" left="103" name="picture_descr" + textbox.max_length="1024" textbox.show_context_menu="false" top_pad="0" width="178" -- cgit v1.2.3