Ansariel 50341b9735 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llimview.cpp		2023-03-07 13:20:32 +01:00
..
beams	…
beamsColors	…
camera	FIRE-30781 Add TPP camera preset to their list, based on Penny Patton's optimized camera settings (right shoulder)	2022-10-07 00:11:11 +02:00
filters	…
fs_static_assets	…
shaders	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-12-12 22:09:54 +01:00
static_assets	…
windlight	…
anim.ini	…
autoreplace.xml	…
client_list_v2.xml	…
cloud.xml	…
cmd_line.xml	…
commands.xml	…
foldertypes.xml	…
graphic_preset_controls.xml	…
grass.xml	…
grids.xml	…
growl_notifications.xml	…
high_graphics.xml	…
ignorable_dialogs.xml	…
key_bindings.xml	SL-17339 Controls > Restore Defaults should clear the "Walk to" action.	2022-08-17 09:58:34 +02:00
keywords.ini	…
keywords_lsl_default.xml	…
lindenlab.pem	…
llsd-lsl-syntax.rng	…
llsd.xsd	…
logcontrol.xml	…
low_graphics.xml	…
mid_graphics.xml	…
posestand.xml	…
quick_preferences.xml	…
scriptlibrary_aa.xml	…
scriptlibrary_ossl.xml	…
scriptlibrary_preproc.xml	…
settings.xml	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-12-12 22:09:54 +01:00
settings_crash_behavior.xml	…
settings_files.xml	…
settings_firestorm.xml	…
settings_hybrid.xml	…
settings_per_account.xml	Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer	2023-03-07 13:20:32 +01:00
settings_phoenix.xml	…
settings_text.xml	…
settings_v3.xml	…
std_bump.ini	…
trees.xml	…
ultra_graphics.xml	…
viewerart.xml	…