Ansariel
|
6d09c9ff89
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 12:37:05 +02:00 |
|
Ansariel
|
0e90e53231
|
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-02-09 10:31:16 +01:00 |
|
Mnikolenko Productengine
|
8b7691498f
|
SL-16758 Show light controls regardless of current graphic settings
|
2022-02-02 16:39:28 +02:00 |
|
Ansariel
|
7ff1f3100f
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-16 14:37:06 +01:00 |
|
Ansariel
|
b14d460dca
|
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
|
2021-11-10 21:21:51 +01:00 |
|
Mnikolenko Productengine
|
a95d846a5c
|
SL-16218 treat texture selection similar to diffuse map handling.
|
2021-10-25 15:15:02 +03:00 |
|
Ansariel
|
c404ef463b
|
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
|
2020-07-24 10:02:26 +02:00 |
|
Mnikolenko Productengine
|
94eea485ed
|
SL-13545 FIXED The 'Flexible Path' settings can be pasted to the sculpted object
|
2020-07-07 16:04:37 +03:00 |
|
Ansariel
|
8bce76a8f9
|
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer and keep a mix of best of both worlds for the newest cumbersome installment of copy%paste buttons
|
2020-06-22 18:31:01 +02:00 |
|
Andrey Kleshchev
|
052e1adcd0
|
SL-13359 #9 Texture tab
|
2020-06-19 22:18:31 +03:00 |
|
Andrey Kleshchev
|
d95f86c593
|
SL-13359 #7 Features tab
|
2020-06-18 22:38:58 +03:00 |
|
Ansariel
|
846d78345c
|
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
|
2020-04-01 15:00:34 +02:00 |
|
Rye Mutt
|
8e436fc396
|
Fix editing light color corrupting intensity and color values
|
2020-03-30 10:39:10 -04: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 |
|
Ansariel
|
2324368336
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-03-19 08:10:15 +01:00 |
|
Dave Houlton
|
331f290f61
|
Merge master (v 6.3.9) into DRTVWR-440
|
2020-03-18 15:39:38 -06:00 |
|
Dave Houlton
|
7674c00fb9
|
Merge master (v 6.3.8) into DRTVWR-440
|
2020-02-21 12:05:46 -07:00 |
|
Brad Payne (Vir Linden)
|
c9305c1e49
|
merge
|
2020-02-21 15:36:59 +00:00 |
|
Ansariel
|
90cbec4a54
|
Merge DRTVWR-481
|
2020-02-08 18:43:22 +01:00 |
|
Ansariel
|
da365b227e
|
Merge Firestorm LGPL
|
2019-12-13 18:15:19 +01:00 |
|
Brad Payne (Vir Linden)
|
65550520ed
|
SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits.
|
2019-11-15 15:13:11 +00:00 |
|
Ansariel
|
a94d482dd4
|
Merge viewer-neko
|
2019-10-16 00:41:04 +02:00 |
|
maxim_productengine
|
f2d92b05b8
|
SL-12087 FIXED Values for physical preset (wood, stone, metal, etc.) in build tool don't update unless the edited object is reselected.
|
2019-10-10 10:58:14 +03:00 |
|
Ansariel
|
de837a5800
|
Merge Firestorm LGPL
|
2019-08-27 19:04:14 +02:00 |
|
Graham Linden
|
723f1891db
|
Merge 6.3.1 viewer-release
|
2019-08-26 12:35:18 -07:00 |
|
Ansariel
|
3556faaf36
|
Merge viewer-baking-updates
|
2019-03-01 19:10:28 +01:00 |
|
Anchor
|
1b449fa055
|
[SL-10079] - added null check
|
2019-02-20 08:39:58 +05:30 |
|
Anchor
|
38bc052ec6
|
[SL-10079] - animesh handling for baked images
|
2019-02-04 00:46:48 -08:00 |
|
Ansariel
|
acb6fda901
|
Merge viewer-eep
|
2019-01-26 00:02:49 +01:00 |
|
Graham Linden
|
7e9033821a
|
De-duplicate deferred gbuffer access for getPosition/getNorm.
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl
Split shared shadow tap funcs into shadowUtil.glsl
|
2018-12-06 10:59:11 -08:00 |
|
Ansariel
|
3add6996ab
|
Merge Firestorm LGPL
|
2018-06-21 19:55:23 +02:00 |
|
Brad Payne (Vir Linden)
|
9d7b353cbb
|
merge
|
2018-06-21 15:49:53 +01:00 |
|
Ansariel
|
4652565392
|
Merge viewer-neko
|
2018-05-30 21:14:50 +02:00 |
|
andreykproductengine
|
177f24f56f
|
MAINT-8586 Eliminate obsolete xui elements
|
2018-05-29 17:26:10 +03:00 |
|
Ansariel
|
7e7984fcfd
|
Merge viewer-neko
|
2018-05-01 18:42:59 +02:00 |
|
Ansariel
|
eedc0b6073
|
Merge axon
|
2018-04-07 14:12:53 +02:00 |
|
Brad Payne (Vir Linden)
|
267e31717c
|
SL-897 - notification wording fixes
|
2018-04-02 21:57:31 +01:00 |
|
Brad Payne (Vir Linden)
|
5c7f27562d
|
merge
|
2017-11-29 23:40:12 +00:00 |
|
Ansariel
|
d1f365d81d
|
Merge Firestorm LGPL
|
2017-11-29 23:43:03 +01:00 |
|
Ansariel
|
390e15460f
|
Merge axon
|
2017-11-29 23:27:11 +01:00 |
|
Brad Payne (Vir Linden)
|
2f1b75f03e
|
SL-704 - first pass cleaning up comments. Also added LLControlAvatar::initInstance() as a potential hook for optimizations.
|
2017-11-16 19:24:53 +00:00 |
|
Ansariel
|
448f344f54
|
Merge viewer-neko
|
2017-10-05 21:27:43 +02:00 |
|
andreykproductengine
|
f4e303c067
|
MAINT-1209 Fixed Light does not revert to a simple light when texture is set to none
|
2017-09-21 17:01:45 +03:00 |
|
Ansariel
|
01d8e7e347
|
Merge axon
|
2017-09-20 01:09:14 +02:00 |
|
Brad Payne (Vir Linden)
|
3346281be3
|
SL-790 - Adding UI checks for actions that would increase the animated object attachment count
|
2017-09-18 19:51:44 +01:00 |
|
Beq
|
f0196e3017
|
Show physics shape in edit mode
|
2017-08-05 11:53:12 +01:00 |
|
Brad Payne (Vir Linden)
|
0b57379b12
|
SL-722 - animated mesh checkbox inactive unless there's a single object or linkset, all volumes
|
2017-06-27 20:52:02 +01:00 |
|
Brad Payne (Vir Linden)
|
3c8ff04c0f
|
SL-722 - animated object checkbox is based on state of root prim. Enabled only when root prim or whole linkset is being edited.
|
2017-06-21 15:25:50 +01:00 |
|
Brad Payne (Vir Linden)
|
c5dc0ee36e
|
SL-704 - code cleanup
|
2017-06-09 21:13:54 +01:00 |
|
Brad Payne (Vir Linden)
|
4d68945595
|
SL-694 - UI initialization, set mType in LLExtendedMeshParams constructor
|
2017-05-30 15:59:23 +01:00 |