Ansariel 6cbca4da71 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llprofiler.h # indra/llcommon/lluuid.cpp # indra/llprimitive/llmodel.cpp # indra/llrender/llrendertarget.cpp # indra/newview/app_settings/settings.xml # indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl # indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl # indra/newview/llviewerwindow.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/zh/floater_about.xml		2023-02-01 11:40:17 +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 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-02-01 11:40:17 +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	Remove TextureMemory from list of graphic preset controls	2022-11-21 13:31:06 +01:00
grass.xml	…
grids.xml	…
growl_notifications.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	Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer	2022-10-21 11:12:51 +02:00
posestand.xml	…
quick_preferences.xml	…
scriptlibrary_aa.xml	…
scriptlibrary_ossl.xml	…
scriptlibrary_preproc.xml	…
settings.xml	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-02-01 11:40:17 +01:00
settings_crash_behavior.xml	…
settings_files.xml	…
settings_firestorm.xml	…
settings_hybrid.xml	…
settings_per_account.xml	Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer	2022-09-16 09:37:16 +02:00
settings_phoenix.xml	…
settings_text.xml	…
settings_v3.xml	…
std_bump.ini	…
trees.xml	…
viewerart.xml	…