Ansariel
15bbf6510c
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-09 13:14:39 +01:00
Andrey Kleshchev
da3bd5a796
SL-13599 Resolve gcc v10 'no trivial copy-assigment' warnings
2020-11-23 14:03:27 +02:00
Ansariel
f7bd33161b
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 11:05:22 +01:00
Andrey Kleshchev
79ec8a8be4
SL-13599 Fixed missing zero
2020-11-09 13:56:06 +02:00
Ansariel
22b2d0d4e0
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-04 15:33:34 +01:00
Andrey Kleshchev
6786b9118c
SL-13599 Variable should correspond to type
2020-10-28 20:34:12 +02:00
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