Ansariel
|
088cc2ea35
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-09 02:25:42 +02:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Kitty Barnett
|
1fd98d08d2
|
Allow dynamic changes to effect priority
|
2021-05-29 19:17:31 +02:00 |
|
Kitty Barnett
|
70237de361
|
Add actual support for effect priority and enabled/disabled state
|
2021-05-29 18:08:22 +02:00 |
|
Kitty Barnett
|
a0ff6c3542
|
Allow effect ids to be reused for each visual effect (but enforce uniqueness across all instances of the same effect)
|
2021-05-29 17:37:59 +02:00 |
|
Kitty_Barnett
|
110b89e485
|
@setoverlay can cause an infinite loop
|
2021-05-16 22:32:31 +02:00 |
|
Kitty Barnett
|
a2ec15a09d
|
LLVisualEffectParams::step(bool isLast) will always be called with isLast == false (fixes RLVa spheres issues when AA is disabled)
|
2021-04-24 20:24:50 +02:00 |
|
Kitty Barnett
|
f34f08573e
|
Only one @setsphere effect is ever visible (broken when code moved to LLPipeline::renderFinalize)
|
2021-04-24 20:24:44 +02:00 |
|
Kitty Barnett
|
8238aee560
|
Add LLVisualEffectParams (and derived LLShaderEffectParams)
|
2021-01-13 22:10:23 +01:00 |
|
Kitty Barnett
|
099c23ab68
|
Visual effect base branch
|
2021-01-07 23:46:01 +01:00 |