f138e69ea1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-24 10:47:48 +01:00
643fba98bc
FIRE-30501: Let's define My Suitcase properly and give it some icon and stuff...
2020-11-19 13:52:50 +01:00
dae710d74f
FIRE-30481 - [OPENSIM] Fix up buy floater help/donate link
2020-11-14 02:33:18 +00:00
95482f6e96
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2020-10-15 14:34:15 +02:00
4afbe638d9
SL-14067 FIXED The 'Unable to Buy' (L$) error persists until relogin
2020-10-06 15:56:11 +03:00
71537daefd
SL-14057 FIXED The viewer crashes when trying to make a transaction exceeding the L$ balance
2020-10-02 18:53:36 +03:00
fcbea81cd5
Buy currency floater: Don't show SL account website links on OpenSim
2020-09-29 13:06:14 +02:00
4da618c2c7
Buy currency floater: Update label names that display "L$" and need updating the currency symbol on OpenSim
2020-09-29 12:59:35 +02:00
e7cdf88df9
Skip Second Life ad when buying currency on OpenSim if no PIOF
2020-09-23 19:52:22 +02:00
b677e01629
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2020-09-23 19:02:19 +02:00
2c0814b00a
SL-13335 Friendlier L$ Buy flow when no payment method on file
2020-09-23 11:43:53 +03:00
749464660f
SL-13814 Updated label text
2020-09-23 11:39:08 +03:00
9dd18e51c8
SL-13814 mac build fix
2020-09-23 11:38:57 +03:00
1fb0e233ff
SL-13814 Clarify dialog for insufficient L$ balance
2020-09-23 11:38:48 +03:00
73ece91724
SL-11867 Show “Unable to buy” message via notification
2020-09-23 11:38:09 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
2ae0d7a954
SL-11867 Show “Unable to buy” message via notification
2020-02-17 17:43:00 +02:00
24edb1e6ff
Minor fixes for previous commit
2017-09-30 19:01:47 +02:00
4ad7d4b750
Support for multiple currency solutions on a grid and across the hypergrid.
2017-09-20 16:00:25 -07:00
6c56c9bf67
MAINT-6620 FIXED Use internal or external browser according to Preferences
2016-08-09 15:38:16 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8f5f68d1cc
STORM-524 : Fix update L$ balance when buying currency
2010-12-10 16:06:33 -08:00
0df07ea31a
STORM-524 : Add some balance request messages after L$ purchase interaction
2010-12-09 11:45:24 -08:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
c74f870151
(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)
...
- 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
2010-03-18 19:42:38 +02:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
458430be91
Removed include llnotifications.h from llfloater.h trying to speed builds
...
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
f8964b2b4f
EXT-332 DEV-40744: Local currency updates for Buy L$ 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.
2009-10-19 08:39:33 +00:00
5787d576d1
EXT-1356: Updated the Buy L$ floater so that we now display any error
...
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.
2009-10-08 11:45:44 +00:00
cf9814bc05
EXT-332: Updated the visual style of the Buy L$ floater based on
...
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.
2009-10-01 17:52:20 +00:00
eb853f55c0
svn merge -r 128442:129343 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
2009-08-04 01:12:59 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
9dfe0ca9a0
svn merge -r121194:121210
...
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
2009-05-22 09:58:47 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
b406972af1
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, 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
2008-10-28 23:56:20 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
a10f963900
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
...
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
2008-03-04 16:59:57 +00:00
2e32d44e71
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
...
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
7dada07dba
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-20 22:02:36 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Ansariel