| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
release/2024.06-atlasaurus
 # Conflicts:
 #	.github/workflows/build.yaml
 #	indra/newview/CMakeLists.txt
 #	indra/newview/llspeakers.cpp
 #	indra/newview/llvoicechannel.cpp
 #	indra/newview/llvoicechannel.h
 #	indra/newview/llvoiceclient.cpp
 #	indra/newview/llvoiceclient.h
 #	indra/newview/llvoicewebrtc.cpp
 | 
 | 
 | 
 | 
 | 
 | 
LF, and trim trailing whitespaces as needed
 | 
 | 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvovolume.cpp
 | 
 | 
 | 
 | 
 | 
 | 
And hide warning when it's already 0
 | 
 | 
 | 
 | 
editing legacy skies.
 | 
 | 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
# Conflicts:
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/skins/default/xui/en/strings.xml
 | 
 | 
 | 
 | 
class
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
environment editor.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
be changed while a keyframe is selected.
 | 
 | 
 | 
 | 
 | 
 | 
Removed refs to LAPAS. Better sync with legacy regions.
 | 
 | 
 | 
 | 
 | 
 | 
fails.
 | 
 | 
in Inventory the first time.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
environment protocol for viewer specified names on individual tracks.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |