Ansariel 98a48cf1c1 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/pipeline.cpp		2025-10-11 14:35:54 +02:00
..
beams	…
beamsColors	…
camera	…
filters	…
fs_static_assets	…
shaders	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-10-11 14:35:54 +02:00
static_assets	…
windlight	…
anim.ini	…
autoreplace.xml	…
client_list_v2.xml	…
cloud.xml	…
cmd_line.xml	…
commands.xml	Merge branch 'release/2025.04.1' of https://github.com/secondlife/viewer	2025-06-13 19:39:16 +02:00
emoji_groups.xml	…
foldertypes.xml	…
graphic_preset_controls.xml	Revert on removing RenderSkyAmbientScale and RenderSkyAutoAdjustLegacy from graphic preset controls	2025-05-22 19:50:55 +10:00
grass.xml	…
grids.xml	…
growl_notifications.xml	…
ignorable_dialogs.xml	…
key_bindings.xml	…
keywords.ini	…
keywords_lsl_default.xml	…
lindenlab.pem	…
llsd-lsl-syntax.rng	…
llsd.xsd	…
logcontrol.xml	…
message.xml	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-08-12 22:50:51 +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	2025-10-11 14:35:54 +02:00
settings_crash_behavior.xml	…
settings_files.xml	…
settings_firestorm.xml	…
settings_hybrid.xml	…
settings_per_account.xml	Add a functionality to save/restore open IMs from previous session	2025-09-04 12:55:44 +02:00
settings_phoenix.xml	…
settings_text.xml	…
settings_v3.xml	…
std_bump.ini	…
trees.xml	…
viewerart.xml	…