Commit Graph

105 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
Ansariel 7c41871639 Merge viewer-lynx 2017-04-14 12:42:28 +02:00
andreykproductengine 084f7cf44a MAINT-7257 Added null check for volume manager 2017-03-28 16:24:50 +03:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Ansariel 9401c93c7a Merge viewer-bear 2015-11-11 19:40:43 +01:00
ruslantproductengine 049c795b12 Backed out changeset: a79540758404
Need backed out this changes because it influence on material
update see: MAINT-5818
Also this lead to the following:
UserA and UserB logged in same location.
UserA edit normal/specular map texture offsets while UserB is not observe this
changes.
2015-11-11 17:59:14 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
andreykproductengine d9341caf45 MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected 2015-07-17 17:36:33 +03:00
vyacheslavsproductengine 0a333e9a03 MAINT-3548 - FIXED-R2 Horizontal & vertical offset values for normal & specular maps still randomly revert to previous settings when building. 2015-05-19 19:28:03 +04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
ruslantproductengine 5c255726f4 MAINT-3488 FIXED Pose balls are sometimes invisible after standing up until zooming camera closer 2014-12-12 20:14:09 +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
ruslantproductengine c686407731 MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ALPHA_MODE_BLEND, do not render
MAINT-4645 FIXED [viewer-lion] The build tool shows normal or specular map as 'none' when one exists
2014-11-13 18:47:57 +02:00
callum_linden d20c719f03 Update to build on Xcode 6.0: turn off warnings about unused functions from clang for tut package 2014-10-17 16:20:36 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Nicky b2115f4c7b Crash protection. 2014-02-23 23:27:41 +01: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 a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Graham Madarasz f356d7eb9f Fix many issues with selection misapplication and rendering not matching applied materials 2013-05-11 19:58:56 -07:00
Graham Madarasz e413f4b335 Fixup merge diffs 2013-05-10 15:13:07 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nyx Linden 998c31ef9e BUILDFIX fixing undefined reference in build 2013-02-26 15:29:23 -05:00
Oz Linden 5711bda96a clean up some debug logging, add comment on llassert 2013-02-20 12:03:29 -05:00
Kitty Barnett a6e8e60f50 Don't overrun the message buffer extracting materials ids when the region isn't sending them 2013-02-19 21:21:41 +01:00
Brad Payne (Vir Linden) 354ccc1640 additional safety check for bad appearance messages 2013-02-15 13:44:21 -05:00
Brad Payne (Vir Linden) 72dfb2abce SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems 2013-02-13 17:28:05 -05:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -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
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
William Todd Stinson 38a565f71a Initial pass at getting a list of viewer objects with non-null material IDs. 2012-10-09 12:30:38 -07:00
William Todd Stinson dbe0a577ae Removing overly verbose debug outputs. 2012-10-03 18:31:33 -07:00
William Todd Stinson ae10e78d97 Added some initial basic decoding of the material value per face. 2012-09-14 17:56:42 -07:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Brad Payne (Vir Linden) 6ae4802e6d merge 2012-07-30 19:10:46 -04:00
Xiaohong Bao 833d73d674 fix for SH-3235: Bump maps are not loaded until objects change LOD 2012-07-13 17:46:43 -06:00
Brad Payne (Vir Linden) 409be9dcc4 SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates 2012-07-13 16:59:57 -04:00
Tank_Master 63adc57b38 Update 3 of SSB + RLVa 2013-03-05 18:57:27 -08:00
Kitty Barnett d74b2985a5 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2013-03-03 13:13:22 +01:00
Tank_Master 6425b3cd65 Merge RLVa SSB update 2013-02-24 18:24:48 -08:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00