Commit Graph

82 Commits (56da70fa9651164e577caaf866fccec684bbd577)

Author SHA1 Message Date
Ansariel 5d924483a8 Merge viewer-cougar 2018-03-02 15:00:48 +01:00
AndreyL ProductEngine af9069edbf Merged in lindenlab/viewer-release 2018-03-02 00:47:08 +02:00
Ansariel e0ac77b766 Merge Firestorm LGPL 2018-02-12 18:47:28 +01:00
Ansariel e3c05a5d88 Manually pull fix for MAINT-8279 Fix for crash on unset pcode 2018-02-12 18:12:41 +01:00
ruslantproductengine cc30a9e2f5 MAINT-3178 [MAINTENANCE RC] Ribbon particles using textures containing alpha flash white at certain camera angles
FIXED. Based on: 6317cce88f (chg-indra)/newview/llvopartgroup.cpp
and http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/9ecea804a06d
2018-02-03 14:11:26 +02:00
andreykproductengine bd786ada4f MAINT-8279 Fix for crash on unset pcode 2018-02-09 14:19:31 +02:00
Ansariel e41bdfc820 Merge viewer-neko 2017-12-20 23:07:38 +01:00
Mnikolenko Productengine 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
Ansariel 914e18c491 Merge viewer-neko 2017-11-18 17:06:52 +01:00
Mnikolenko Productengine 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
Ansariel 2089713e13 Don't render particles of muted avatars 2016-11-08 16:49:55 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Ansariel 8b64639eb2 Partially undo MAINT-5700: Draw imposter for muted avatars - has always been the case 2016-03-05 01:30:44 +01:00
Ansariel 5d325f4007 Merge viewer-quickgraphics 2016-03-05 00:37:52 +01:00
ruslantproductengine 0ffc4f2667 MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered 2016-03-02 18:35:43 +02:00
Ansariel 847c09ab8c Merge viewer-quickgraphics 2016-02-26 13:13:17 +01:00
Mnikolenko ProductEngine 2ede35f1b6 MAINT-5681 FIXED particles still render when complexity threshold is reached 2015-12-01 15:29:43 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
callum_linden 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
callum_linden 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
Ansariel a30090071c FIRE-11745 / MAINT-3178: Fix particles using textures containing alpha flash white at certain camera angles by partially undoing 6317cce88ffc (particle index accounting); Found by Shyotl Kuhr (Singularity viewer) 2015-01-05 15:14:02 +01:00
Nicky cdb30d7498 FIRE-14264; FPS drop due to particle patch. 2014-08-02 14:57:53 +02:00
Nicky b37c6e7cf0 New patch to fix the particle corruption and flashing. Try to group particles into on adjacent VBO to avoid slowdowns. 2014-07-21 18:05:21 +02:00
Nicky 6128f59788 Post-Merge sweep. Remove operator new/delete. 2014-06-10 16:10:10 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 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
Dave Parks cacefaf2fc MAINT-2811 Fix for infinite loop on octree code during teleport. 2013-08-30 15:55:20 -05:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon 5687b0c4df Merge 2013-05-09 15:30:49 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon 8895e79576 Merge downstream code / viewer-beta 2013-05-09 13:21:22 -07:00
Dave Parks dbfcd6c9c5 Optimization -- don't draw glow in alpha pool unless needed 2013-05-07 17:20:33 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Xiaohong Bao 7a33d88886 freeze particle system when monitor scene loading 2013-03-28 16:52:36 -06:00
Dave Parks 08ae21f52d MAINT-2410 Extra Particle Parameters -- viewer implementation
Reviewed by Kelly and Graham
2013-03-13 17:07:22 -05:00
Tank_Master eaaf782fdf Merge LGPL 2013-09-12 21:18:44 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Cinders 1c7a593517 FIRE-11593: Opensim "4096 Bug" proposed fix generously contributed by Latif Khalifa 2013-09-12 19:58:11 -06:00
Tank_Master 831e4f443b Merge LL 3.6.3 pass 1 2013-08-26 17:09:27 -07:00
simon@Simon-PC.lindenlab.com 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
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Xiaohong Bao c0ba626c80 For SH-3333: Design and implement a new object cache system on viewer side 2012-10-15 21:34:29 -06:00
Tank_Master 9fbf6f421f Merge LGPL 2013-01-28 08:04:11 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00