diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-02 12:24:31 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-02 12:24:31 +0000 |
| commit | 3e8b1006fbfcc43ecd9765369eb454bef26460fc (patch) | |
| tree | 0eef774227e9627f9b3523a0ef79333d2a33ec8d /indra | |
| parent | d1d195ba904490c19faf2078560f49c3a6b16a18 (diff) | |
| parent | 9c8a8f388ab24c404f19602e156a76ad1a03b841 (diff) | |
PE merge.
Diffstat (limited to 'indra')
5 files changed, 15 insertions, 11 deletions
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 3e374acdb3..836331b44b 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1294,11 +1294,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/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) 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]" /> - <check_box - enabled="false" - height="16" - label="Auto renew each week" - layout="topleft" - left="10" - name="auto_renew" - top_pad="5" - v_pad="0" - width="290" /> <text_editor allow_scroll="false" bg_visible="false" @@ -161,6 +151,16 @@ tool_tip="Price for listing." v_pad="0" width="105" /> + <check_box + enabled="false" + height="16" + label="Auto renew each week" + layout="topleft" + left="10" + name="auto_renew" + top_pad="5" + v_pad="0" + width="290" /> <text_editor allow_html="true" allow_scroll="false" 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" |