0ee82f5264
SL-18641 fix for 'Always display friends in full detail' setting
2022-11-17 15:04:38 +02:00
dcd74c98dc
SL-18202 impostor too slow avatars and add autotune settings button to Preference
2022-09-27 19:35:49 +03:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
cc30a9e2f5
MAINT-3178 [MAINTENANCE RC] Ribbon particles using textures containing alpha flash white at certain camera angles
...
FIXED. Based on: 6317cce88f (chg-indra)http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/9ecea804a06d
2018-02-03 14:11:26 +02:00
bd786ada4f
MAINT-8279 Fix for crash on unset pcode
2018-02-09 14:19:31 +02:00
8bceb80902
MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object
2017-12-05 18:19:30 +02:00
17c22d317f
MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object
2017-11-09 16:09:51 +02:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
0ffc4f2667
MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered
2016-03-02 18:35:43 +02:00
2ede35f1b6
MAINT-5681 FIXED particles still render when complexity threshold is reached
2015-12-01 15:29:43 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
577a3973ea
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20 14:00:39 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
cacefaf2fc
MAINT-2811 Fix for infinite loop on octree code during teleport.
2013-08-30 15:55:20 -05:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06: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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
5687b0c4df
Merge
2013-05-09 15:30:49 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
dbfcd6c9c5
Optimization -- don't draw glow in alpha pool unless needed
2013-05-07 17:20:33 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
7a33d88886
freeze particle system when monitor scene loading
2013-03-28 16:52:36 -06:00
08ae21f52d
MAINT-2410 Extra Particle Parameters -- viewer implementation
...
Reviewed by Kelly and Graham
2013-03-13 17:07:22 -05:00
c72a0b7bbc
MAINT-2158 - Particle grievance. Particles are not added at less than 4 fps.
...
Reviewed by Kelly
2013-01-22 13:51:19 -08:00
c0ba626c80
For SH-3333: Design and implement a new object cache system on viewer side
2012-10-15 21:34:29 -06:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
423659c680
MAINT-775 Particle vertex buffer management optimizations
2012-05-02 15:45:38 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05:00
344eaeb39b
CID-376
...
Checker: UNINIT_CTOR
Function: LLViewerPart::LLViewerPart()
File: /indra/newview/llviewerpartsim.cpp
2010-01-27 16:27:02 -08:00
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
46f8fb8781
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
...
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +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
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
dc48f1c741
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
...
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
2008-04-03 22:50:22 +00:00
b5936a4b1d
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
...
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +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
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
13c391f198
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
...
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +00:00
Maxim Nikolenko