Ansariel 18903f6cac Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp		2024-06-11 19:04:21 +02:00
..
beams	…
beamsColors	…
camera	SL-20277 remove settings from camera presets	2023-09-11 19:49:28 +03:00
filters	…
fs_static_assets	…
shaders	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-11 19:04:21 +02:00
static_assets	…
windlight	…
anim.ini	…
autoreplace.xml	…
client_list_v2.xml	…
cloud.xml	…
cmd_line.xml	SL-19585 Try replacing fmod with openal	2024-02-09 01:31:50 +02:00
commands.xml	Fix debug setting name FSAutoTuneFPS -> AutoTuneFPS (and sync unused floater_performance.xml with upstream)	2023-08-28 13:03:41 +02:00
emoji_groups.xml	SL-19951 Organize emoji categories in groups	2023-07-07 00:22:34 +02:00
foldertypes.xml	…
graphic_preset_controls.xml	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-11 19:04:21 +02:00
grass.xml	…
grids.xml	[OPENSIM] New grid builder for OpenSim	2024-06-01 21:49:23 +01:00
growl_notifications.xml	…
ignorable_dialogs.xml	…
key_bindings.xml	…
keywords.ini	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-10-13 01:06:42 +02:00
keywords_lsl_default.xml	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-10-13 01:06:42 +02:00
lindenlab.pem	…
llsd-lsl-syntax.rng	…
llsd.xsd	…
logcontrol.xml	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-08-09 11:05:56 +02:00
posestand.xml	…
quick_preferences.xml	…
scriptlibrary_aa.xml	…
scriptlibrary_ossl.xml	…
scriptlibrary_preproc.xml	…
settings.xml	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-11 19:04:21 +02:00
settings_crash_behavior.xml	…
settings_files.xml	…
settings_firestorm.xml	…
settings_hybrid.xml	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer	2023-07-28 20:26:58 +02:00
settings_per_account.xml	…
settings_phoenix.xml	…
settings_text.xml	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer	2023-09-27 20:16:00 +02:00
settings_v3.xml	Enable new object profile by default	2023-10-04 03:28:01 +02:00
std_bump.ini	…
trees.xml	…
viewerart.xml	…