Age | Commit message (Collapse) | Author |
|
|
|
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
|
|
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml
Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/
--HG--
branch : product-engine
|
|
Cuts number of includes of llnotifications.h from 300+ to 40.
|
|
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
|
|
Added links to the Buy L$ floater to access payment method, local
currency settings, and exchange rate. Also included required text
about re-entering value in order to update exhance rate. And added a
notification on successful payment, as some foreign currency
transactions can take up to 20 mins to complete.
Worked with Ram on Erica on the design. The actual text may need some
tweaking once we hear back from Gisland. The URLs are placeholder for
now.
|
|
message that we received from the server. It wasn't a good idea to
ignore these and assume that any problem could be dealt with by going
to the secondlife.com billing webpage.
I also improved the layout of the main Buy L$ page. For example, the
"Getting data..." message now appears in the same place where the
actual currency figure will be updated. I also generally improved the
placement of text and buttons.
|
|
Erica's design. Now any errors during the L$ purchase process will
give you a nice prompt to visit the SL website.
Replaced all user-visible references to the illegal term "currency"
with the term "L$".
Also fixed an outstanding bug with this floater: if you clicked the
Buy button but then cancelled the confirmation dialog, then the Buy
button would remain disabled. Now the Buy button is only disabled
during periods when you actually cannot buy.
Added initial support for local currencies, with the use of a new
[LOCALAMOUNT] field in the XUI files. When the XML-RPC server can
actually return local currency details, we can hook this up by just
changing llcurrencyuimanager.cpp.
Discussed XML-RPC interaction with Morpheus. Thanks to Erica for
the images and first cut at the XUI.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
|
ignore-dead-branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
incorporating:
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
|
|
dataserver-is-deprecated
|
|
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
|
|
QAR-424
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
|
|
79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
|
|
|
|
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
|
|