Commit Graph

245 Commits (bfe520387ed3061ba55ea2e58c565016e7a3159e)

Author SHA1 Message Date
maksymsproductengine 63cc379c72 MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found 2013-10-04 02:50:50 +03:00
Graham Linden d310105121 Merge recent viewer-bear fixes that missed the boat 2013-09-25 13:16:31 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
simon_linden d3625d0b67 Merge downstream code 2013-09-19 15:30:34 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Graham Linden 62011c2871 Fix merge issues from genBBoxes optimizations fighting with genBBoxes optimizations and missing statics 2013-08-19 12:56:04 -07:00
simon 237dbb26f3 Merge downstream code - Vivox update 2013-08-05 14:55:12 -07:00
simon ee25146ce4 Merge downstream code 2013-08-01 16:19:49 -07:00
simon 440e576f86 MAINT-2949 : Objects across the sim border do not render when approached. Added
missing code block from previous change as per Dave P's advice
2013-08-01 11:38:17 -07:00
PavelK ProductEngine 721a2ac06a MAINT-2717 FIX Cannot see kittycorner SLS region from Sunshine region 2013-07-22 21:32:22 +03:00
Graham Linden de4892b337 NORSPEC-288 remove unassertable asserts from restoring code to condition normals for this fix 2013-06-25 16:25:22 -07:00
Dave Parks 4696eeeb30 Merge cleanup. 2013-06-21 17:07:37 -05:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks 4e46ce5520 MATBUG-204 Fix for crash in genVolumeBBoxes 2013-06-20 17:17:28 -05:00
Graham Madarasz 88553c9eb1 Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8 2013-06-12 12:19:48 -07:00
Graham Madarasz d2b253f1f6 Changes to protect against use of normalize3fast on degenerate vectors 2013-06-12 09:16:19 -07:00
Graham Madarasz eba7eb2d06 NORSPEC-233 fix default value and material apply logic errors 2013-06-08 06:28:48 -07:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Dave Parks 743d1a777e NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
2013-05-29 18:48:09 -05:00
Graham Madarasz a37bff8bf1 NORSPEC-103 reflect normal/spec UVs in face edit overlay display 2013-05-14 15:26:43 -07:00
Graham Madarasz e413f4b335 Fixup merge diffs 2013-05-10 15:13:07 -07:00
Graham Madarasz a9ede98915 NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings 2013-05-06 08:56:32 -07:00
Graham Madarasz (Graham) 9187a06d0b NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well 2013-05-03 09:16:15 -07:00
Graham Madarasz (Graham) 419a06036b Merge with vwr-dev-mat 2013-05-03 08:22:50 -07:00
Dave Parks 6bb9c2720e NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool. 2013-05-02 12:35:48 -05:00
Graham Madarasz ced83c5248 Merge vwr-dev-mat 2013-04-26 13:13:55 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Dave Parks 8bf4f15911 NORSPEC-104 Fix for texture animation sometimes not overriding specular and normal map texture coordinates. 2013-04-25 17:15:47 -05:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
simon c7bab8ab8b Merge 2013-04-11 16:04:21 -07:00
Dave Parks 78d23e6642 NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water. 2013-04-10 00:27:32 -05:00
Dave Parks 14f02e48b8 NORSPEC-66 Hook up material parameters to rigged attachments. 2013-03-29 20:12:27 -05:00
Dave Parks fc4869fb78 NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps. 2013-03-29 16:13:36 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 41ca92c67c NORSPEC-54 Potential fix for crashing on all sorts of random operations. 2013-03-25 18:27:07 -05:00
Graham Madarasz (Graham Linden) 35383790fb Merge pragma warning hack to fix linux build 2013-03-12 04:40:51 -07:00
Graham Madarasz 6613d80d72 Clean up moving llalignedarray and fast memcpy to llcommon 2013-03-11 14:19:05 -07:00
Dave Parks 586025bde5 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-03-04 18:06:29 -06:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Graham Madarasz (Graham) 4e81a84abd Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively. 2013-03-04 08:57:58 -08:00
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Dave Parks f5e5396c3a MAINT-2371 First set of profile guided optimizations.
Reviewed by Graham
2013-02-26 15:15:08 -06:00
Dave Parks f67087b872 MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider) 2013-02-20 19:30:46 -06:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
simon@Simon-PC.lindenlab.com ee87ef2303 merge downstream code from viewer-lion 2013-01-30 15:25:09 -08:00
Geenz aa1befd689 Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry. 2013-01-30 12:17:04 -05:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00