Commit Graph

33 Commits (18903f6cacd2afe23b7d8a08568aff2b7930d43e)

Author SHA1 Message Date
Ansariel 343aeeeb36 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	doc/contributions.txt
#	indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-16 02:11:51 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Cosmic Linden 2f18d74f9a SL-20606: Full GLTF material preview. Works for most materials. 2024-01-19 15:43:13 -08:00
Cosmic Linden 07a830a4ce SL-20062: Fix near clip on reflection probes being clamped to at or below 10 2023-10-12 13:02:23 -07:00
Dave Parks 5882215a6d SL-19321 Optimization pass -- Remove another shadow split from probe render, incidental decruft. 2023-03-24 14:33:41 -05:00
Graham Linden d7ad30a2d4 SL-10566 part the fourth
Fix water rendering causing distortion map update very frame.

Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness).

Add ability to retrieve current user clip plane so it can be saved/restored around water map gen.

Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again.

Re-enable occlusion in distortion map rendering.
2019-02-27 17:07:31 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Xiaohong Bao 6a0a5c18e3 more fix for SH-4607: Create new object cache tuning parameters
fix remote objects not showing up.
2013-11-13 22:38:19 -07:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
simon 6db14e3988 MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexes
bullet-proof.  Reviewed by Kelly
2013-07-30 15:12:02 -07:00
Xiaohong Bao 4cca9ba279 fix for SH-4293: texture console takes a while to settle down on Interesting viewer. 2013-07-29 10:15:10 -06:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Xiaohong Bao e1247d631f fix for SH-3619: some objects are missing 2012-12-18 14:36:46 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
Brad Payne (Vir Linden) e4a1b12e7a SH-2789 WIP - build without tcmalloc, force alignment in various places 2011-12-15 12:48:07 -05:00
Loren Shih e3ed1565f8 Automated merge up from viewer-development into mesh-development 2011-02-10 10:44:21 -05:00
Aleric Inglewood 9531046609 STORM-955: VWR-24312: Massively duplicated objects
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.

After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
Roxie Linden 0b4c2fa99e Fix windows build break 2010-12-23 23:31:25 -08:00
Roxie Linden 57153cf0f1 SH-655 - Project mesh viewer crashes on exit.
A copy constructor was implemented which did a memcpy,
which included the vtable pointer which was to another object of another
class (same child though).  This resulted in the wrong destructor
being called.
The reason for the memcpy was for alignment purposes.

The solution was to move to LLVector4a, which is intrinsicly aligned.

Also, did some performance optimizations based on the LLVector4a optimizations.


The solution was to re-implement the
2010-12-23 01:48:44 -08:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 26ba00b555 Vectorized octree and much of llspatialpartition and lldrawable.
Octree driven raycast.
2010-06-03 12:52:28 -05:00
Dave Parks bd216c9649 Fix for shadows from skyboxes hitting the ground. 2010-04-22 16:52:05 -05:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00
Aaron Brashears 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
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
Don Kjer 3855896097 EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
Brian McGroarty d273ba2ce2 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
Brian McGroarty e1e1212daa QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated 2008-05-07 17:17:42 +00:00
Brad Kittenbrink 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
Aaron Brashears 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
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00