Commit Graph

192 Commits (c513ebb777b5345416683404454125cd94de838c)

Author SHA1 Message Date
Andrey Kleshchev 10775e3079 SL-13599 Don't spam into logs when te has no material ids 2020-10-28 19:05:14 +02:00
Andrey Kleshchev 89fb672503 SL-13599 Missing bounds checks in deserializer code
Pulled in and updated Rider's changes
2020-10-19 21:46:56 +03:00
Ansariel 846d78345c Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer 2020-04-01 15:00:34 +02:00
Runitai Linden e468d80186 SL-12902 Better fix for light color values in color swatch not matching light color values inworld. 2020-03-27 17:32:01 -05:00
AndreyL ProductEngine cd895d6e58 Merged in lindenlab/viewer-bear 2019-09-05 21:55:56 +03:00
Ansariel 642d28245f Merge Firestorm LGPL 2019-08-31 14:30:14 +02:00
Ansariel 529569cdd9 Merge viewer-neko 2019-08-04 12:09:33 +02:00
andreykproductengine 87be5f7997 SL-4150 Rename htonmemcpy 2019-07-24 16:58:24 +03:00
Anchor 504a138cb1 Merge 2019-05-10 12:22:29 -06:00
Ansariel 892d224446 Merge Firestorm LGPL 2019-01-31 21:10:17 +01:00
Ansariel f9ec853f4a Merge viewer-neko 2019-01-03 19:07:09 +01:00
maxim_productengine 0acab8ba2d SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube 2018-12-24 15:57:04 +02:00
maxim_productengine 1dbc638d38 SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cube 2018-12-24 15:57:04 +02:00
Anchor 014480a79b Merge 2018-11-28 15:16:01 -08:00
Ansariel f04189ed9f Merge Firestorm LGPL 2018-11-17 01:03:38 +01:00
Anchor Linden f848271c28 fix line endings 2018-06-19 23:04:29 +05:30
Anchor Linden cb4ba0b15e fix line endings 2018-06-19 23:04:29 +05:30
Ansariel 4aa45cb8e1 Merge viewer-baking-updates 2018-06-16 13:22:49 +02:00
Anchor Linden 7abb0c99be [DRTVWR-476] - add universal head,upper,lower tattoos 2018-06-13 01:09:27 +05:30
Brad Payne (Vir Linden) 2a2046fd07 merge 2018-06-05 22:44:04 +01:00
Anchor Linden 6e1cbd04b4 Merge 2018-06-05 23:21:30 +05:30
Ansariel 2de275724b Merge Firestorm LGPL 2018-06-01 22:29:06 +02:00
Ansariel acfe7e625e Merge Firestorm LGPL 2018-06-01 22:10:21 +02:00
Ansariel 1b485c97e6 Merge viewer-baking-updates 2018-05-31 12:21:16 +02:00
Anchor Linden f277aed218 [DRTVWR-455] - add new bake testure and tattoo slots 2018-05-24 01:17:07 -07:00
Ansariel f9d432a570 Merge Firestorm LGPL 2018-05-08 19:29:46 +02:00
Ansariel a2879b80a6 Merge Firestorm LGPL 2018-05-08 17:13:44 +02:00
Nicky 8a81a43161 Merge. 2018-04-10 11:42:59 +02:00
Nicky b96bd81ff5 Replace hardcoded 16 with UUID_BYTES where apropriate (Nat gets sad from hardcoded 16). 2018-04-03 22:06:45 +02:00
Nicky da6f3cf16a As per discussion with Nat, replace those calls to getTE who blindly assume getTE will return a valid pointer with getTEref.
In case that assumption would be wrong the viewer will at least blow up in getTEref rather than deferencing a nullptr and limping along with undefined behavior (or odd crashes).
2018-04-03 13:18:19 +02:00
Nicky 3c8a71c017 Removing some more undefined behavior. Testing for a 'null-reference' (no such thing in C++) is undefined behavior and the compiler will optimize the case where the reference is invalid away.
After disussing with Nat remove that check and introduce new companion methods get...ref which fail in case an invalid reference would be returned.
2018-04-03 12:04:53 +02:00
Ansariel 5d924483a8 Merge viewer-cougar 2018-03-02 15:00:48 +01:00
ruslantproductengine 68200703f2 MAINT-6645 - Improvement - Agents that render as jelly dolls should have their attachments render at 0 LoD to prevent loading higher LoD complexity in memory thus deterring crashes.
Stability improve. (viewer x64)
2017-12-14 20:30:40 +02:00
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Brad Payne (Vir Linden) 4d68945595 SL-694 - UI initialization, set mType in LLExtendedMeshParams constructor 2017-05-30 15:59:23 +01:00
Brad Payne (Vir Linden) 7691780825 SL-694 - Added extra param field for flags related to extended mesh functionality. Currently this is just one bit to flag an object as able to animate 2017-05-25 11:11:02 +01:00
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
ruslantproductengine 6770c27321 MAINT-6645 - Improvement - Agents that render as jelly dolls should have their attachments render at 0 LoD to prevent loading higher LoD complexity in memory thus deterring crashes.
Comments:
- Fix based on "RenderAutoMuteByteLimit" setting.
- File indra/llxml/llcontrol.h - add all signals to 0 group.
  It garanty that handlers (in indra/newview/llviewercontrol.cpp) will be called last.
2017-01-24 15:56:25 +02: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
Kitty Barnett e1526c4048 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
Kitty Barnett b368a21202 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Brad Payne (Vir Linden) 27c7b259b4 SH-3267 WIP 2012-07-12 18:24:23 -04:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Brad Payne (Vir Linden) e4a0dda457 SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards 2012-06-28 14:24:04 -04:00
Brad Payne (Vir Linden) 07545e99fc SH-2689 FIX - a bit more logging and related cleanup. Somewhat arbitrarily calling this done, although tweaks will be ongoing 2012-02-29 13:09:28 -05:00
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Boroondas Gupte 2c584790d0 VWR-24487 make PREHASH variables char const* const 2011-04-01 09:14:52 -04:00
Arrehn 87dd359b1c Opensim - detect and use various configuration limits which might be different from SL, by ArminW 2011-08-28 07:10:09 -04:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00