Ansariel
|
0e037b525a
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llmath/llvolume.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/gltf/buffer_util.h
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerregion.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-11 15:47:42 +02:00 |
|
Ansariel
|
5751bffe3c
|
Just use override too...
|
2024-05-26 11:29:37 +02:00 |
|
Ansariel
|
79cf14a979
|
Clean up FSFloaterWhiteListHelper
|
2024-05-26 11:27:20 +02:00 |
|
Beq
|
a0367b968e
|
Add AV White list helper
Initial version, text may need cleaning up based on support experience
wiki page can be adjusted to use the new floater to better guide actions.
|
2024-05-26 01:39:11 +01:00 |