Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
|
|
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
|
|
|
Co-authored-by: Yuzuru Kato <pascal.imac@gmail.com>
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Material
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
|
|
|
Dupplicate. No idea how it got into the merge
|
|
Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
updater. Add probe update debug display.
|
|
|
|
|
|
|
|
|
|
|
|
does not consolidate opaque textures
|
|
|
|
Cleanup. Caused by a merge of main(D567) into D559
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
InventoryLimitReachedAIS
|
|
|
|
|
|
|
|
|
|
|