From 879f0cd5fd7582546f18054b99fa127942d63e3d Mon Sep 17 00:00:00 2001 From: Callum Prentice <callum@lindenlab.com> Date: Tue, 25 May 2010 16:06:01 -0700 Subject: [PATCH] Updated install.xml to point to a version of temporary version LLQtWebKit that skips past SSL/Cert errors so QuickBuy functions can be tested. (Windows only) Also tweaked the QuickBuy Currency floater so scrollbars do not appear for current Web content --- .../default/xui/en/floater_buy_currency_html.xml | 16 ++++++++-------- install.xml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml index ab44082070b..4643f66bd89 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml @@ -2,26 +2,26 @@ <floater legacy_header_height="18" can_resize="false" - height="240" + height="280" layout="topleft" - min_height="240" - min_width="420" + min_height="280" + min_width="450" name="floater_buy_currency_html" help_topic="floater_buy_currency_html" save_rect="true" single_instance="true" title="BUY CURRENCY" - width="422"> + width="452"> <floater.string name="buy_currency_url" translate="false"> - http://user.lindenlab.com/~callum/ez/index.php?lang=[LANGUAGE]&sa=[SPECIFIC_AMOUNT]&sum=[SUM]&msg=[MSG]&bal=[BAL] -</floater.string> + https://quick-buy-www.jeff.ooze.lindenlab.com/en/display + </floater.string> <web_browser - bottom="238" + bottom="278" follows="left|right|top|bottom" layout="topleft" left="2" name="browser" top="18" - width="420" /> + width="450" /> </floater> diff --git a/install.xml b/install.xml index bb2f8c1f2f6..c6b6ffda810 100644 --- a/install.xml +++ b/install.xml @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string> <key>windows</key> <map> <key>md5sum</key> - <string>d682ed6232193b4eab3170657a54ebf9</string> + <string>1d9697fed57084eea7b3dc250e9c66f7</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100519.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100525.tar.bz2</uri> </map> </map> </map> -- GitLab