Ansariel 76f2b1f48c Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloaterspellchecksettings.h # indra/newview/llpaneleditwearable.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewertexture.h		2024-07-16 10:44:38 +02:00
..
beams	…
beamsColors	…
camera	…
filters	…
fs_static_assets	…
shaders	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-03 01:11:47 +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	…
emoji_groups.xml	…
foldertypes.xml	…
graphic_preset_controls.xml	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-07-02 01:23:35 +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	…
keywords_lsl_default.xml	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 19:46:51 +02:00
lindenlab.pem	…
llsd-lsl-syntax.rng	…
llsd.xsd	…
logcontrol.xml	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 19:46:51 +02:00
posestand.xml	…
quick_preferences.xml	…
scriptlibrary_aa.xml	…
scriptlibrary_ossl.xml	…
scriptlibrary_preproc.xml	…
settings.xml	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-16 10:44:38 +02:00
settings_crash_behavior.xml	…
settings_files.xml	…
settings_firestorm.xml	…
settings_hybrid.xml	…
settings_per_account.xml	…
settings_phoenix.xml	…
settings_text.xml	…
settings_v3.xml	…
std_bump.ini	…
trees.xml	…
viewerart.xml	…