Age | Commit message (Collapse) | Author |
|
Missed the second change... Here it is.
|
|
|
|
|
|
Marchcat/yz merge
|
|
|
|
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
|
|
Drop python version from matrix configuration as it's always 3.11.
|
|
|
|
This file is no longer used.
|
|
|
|
This reverts commit 810a3d24c2e3671f926091c062b101bdec6a1517. (secondlife/jira-archive-internal#70482)
|
|
|
|
This reverts commit d07cd115e3bdef8a2b1d2f6a5a507ddb67ff8cd9.
|
|
CI: adopt xz compression, actions/*-artifact@v4
|
|
Release (Maint W) -> Maint X merge
|
|
png_read_info triggered a PngError, LLAppViewer::frame() handled it
instead of LLPngWrapper::readPng, and since status didn't
change viewer tried to decode image again and again and again.
|
|
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
|
|
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
|
|
Merge main into maint-A
|
|
DRTVWR-600-maint-A
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
|
|
Remove unused fix-incredibuild.py
|
|
Remove BuildParams
|
|
CI: Remove python-version from matrix
|
|
Drop python version from matrix configuration as it's always 3.11.
|
|
|
|
This is to do with misunderstandings related to how .find()
works with multimaps. .find() will, in fact, return an iterator
to the first iterator it finds, and will iterate through all
elements in the multimap when incremented, not just items with
the same key.
Change code working with animation sources to be aware of this
fact, so unrelated animation sources do not have their animations
stopped.
|
|
Release (Maint W) -> Maint YZ merge
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
|
following promotion of secondlife/viewer #690
|
|
|
|
|
|
|
|
|
|
secondlife/guru/viewer-925-missing-simple-smile-emoji
secondlife/viewer#925 Missing simple :smile emoji
|
|
|
|
Obvioulsy, there has been a typo done when copying WL default sky parameters to EE ones.
This causes "static" and quite unrealistic clouds when this default setting is used as a
base for a new sky setting, and we see this bad static sky resurfacing now with PBR and
its "adjusted" (more like hacked, but this is another story) mid-day sky setting.
Let's fix this typo once and for all in LL's code base (most TPVs have it fixed already,
and this ever since EEP got released).
@LL: please also fix the cloud scroll rate in the PBR mid-day inventory setting accordingly.
|
|
|
|
Update boost from 1.81.0 (2022) to 1.84.0 (2023) and enable the
`boost.json` module so that it can replace rapidjson.
|
|
This file is no longer used.
|
|
looks like file that was being parced got corrupted 'in progress'
|
|
|
|
|
|
llDialog buttons
|
|
|
|
|
|
Merge main into maint YZ
|
|
|
|
# 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
|
|
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterenvironmentadjust.cpp
# indra/newview/llpaneleditwater.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
|
|
# Conflicts:
# .github/workflows/build.yaml
|