Files
Ansariel 4ac6439779 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llfilesystem/lldir.cpp
#	indra/llmessage/llexperiencecache.cpp
#	indra/llui/llfloaterreg.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/lltoolbar.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llagent.h
#	indra/newview/llappearancemgr.h
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llnamelistctrl.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/llviewermessage.h
2025-12-01 15:21:18 +01:00
..