7732257ea5
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-11-02 13:05:00 +01:00
d0e07c770b
Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type.
2022-10-30 06:56:16 -04:00
a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
49b7ce025d
SL-7934 Driver version from wrong GPU
2021-08-20 13:54:50 +03:00
7236079a09
FIRE-8264: System info displays wrong driver version on Optimus systems
2020-11-11 09:53:33 +01:00
863a662c6f
Add missing log output
2020-05-05 17:19:21 +02:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
94d4364084
SL-12103 More reliable memory detection
2019-10-16 22:36:10 +03:00
287c920ff2
Merge viewer-lynx
2019-09-30 19:05:31 +02:00
7829b4d3f4
SL-3221 Safeguard against crashes in LLDXHardware
2019-09-19 14:54:55 +03:00
099d988fe2
Merge viewer-neko
2017-05-25 22:49:53 +02:00
c9f9e93889
MAINT-2060 Fixed Double Freeze when clicking on Help>About Second Life
2017-05-19 20:28:59 +03:00
33ca7d27f7
Add more logging output regarding VRAM detection on Windows
2016-07-25 14:29:22 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
92cebdf6a7
FIRE-15891: Add option to disable WMI check in case of problems
2015-04-19 11:51:26 +02:00
8dee70dfbb
MAINT-2980 Fix for AMD cards reporting system ram + vram for dedicated vram -- use WMI instead of DxDiag to get dedicated video memory.
2014-06-30 19:54:28 -05:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04: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
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
e77de5d685
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
...
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00
55c25229b7
svn merge -r 83778:83944 maint-ui-10-merge
...
QAR-442
2008-04-03 18:43:54 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
2e7c0d973e
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
2007-11-20 23:42:48 +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
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Ansariel