Age | Commit message (Collapse) | Author |
|
|
|
|
|
Group member pagination is not ready, disable it untill later
|
|
|
|
|
|
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerparceloverlay.cpp
|
|
|
|
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llvovolume.h
|
|
This reverts commit a42a77f0aacf5878f29edafc42b8b230dc290bb6.
|
|
This reverts commit 93f5747aaacb4109eece1165dd76a5a5f01e0e77.
|
|
This reverts commit 3fa052f6a2e642a6f1c450ec77f7b47a49016558.
|
|
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/llui/llmodaldialog.cpp
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/tests/llviewerassetstats_test.cpp
|
|
# Conflicts:
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
|
|
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llwearableitemslist.cpp
|
|
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llcontrolavatar.cpp
# indra/newview/llinspecttexture.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
|
|
cause it relies on querying mSamplesQuery, which would only have a
value if it could run glBeginQuery(GL_SAMPLES_PASSED, mSamplesQuery).
|
|
(cause eTextureType seems to have been designed to mirror sGLTextureType)
otherwise you'd get a GL error of invalid enum of the first argument
for glTexImage2D.
|
|
# Conflicts:
# indra/newview/llinventorybridge.cpp
|
|
# Conflicts:
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llhudobject.cpp
# indra/newview/llhudobject.h
# indra/newview/llviewermenu.cpp
|
|
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/llappviewer.cpp
# indra/newview/llconversationlog.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
|
|
(#2518, #2519)"
This reverts commit 6af471482d6801530915c1c9ae4bdf788af52eae.
|
|
(#2518, #2519)"
This reverts commit 6af471482d6801530915c1c9ae4bdf788af52eae.
|
|
|
|
Fix GHA matrix config linux build
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and increase default bit depth to 8
|
|
|
|
|
|
|
|
|
|
Project: RLVa
|
|
|
|
|
|
During compile time try to detect libwayland-client-dev is installed,
- If yes, compile a viewer which can run and start under wayland. libwayland-client is needed to detect if the viewer is hidden/minimized.
- if no, disable wayland support and refuse to start the viewer under wayland (xwayland is okay).
To not introduce a hard link dependency on libwayland-client.so the object will be loaded dynamically if needed.
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
|
|
|
|
|
|
|
Missing `llviewerjointattachment.cpp` change for refresh attachments to fully function
https://github.com/FirestormViewer/phoenix-firestorm/commit/07ad25c6be898e42e870b1b6db84f6b16b7275f6#diff-c4316b59d0c69a9672ddfb53e2bc9172c30f1f30017a9c7e4ce817c0905e47cbR34
|
|
|
|
|
|
|
|
|
|
Update GHA runner to macos-14
|