Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
# Conflicts:
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewermenufile.cpp
|
|
|
|
|
|
|
|
|
|
|
|
Includes the conversion to VS2017 build tools.
|
|
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
|
|
# Conflicts:
# autobuild.xml
|
|
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
|
|
|
|
|
|
|
|
|
|
Reverted LLImage to singleton conversion
|
|
|
|
|
|
|
|
|
|
|
|
linker errors
|
|
|
|
|
|
|
|
llassert is not used in 'release' configuration and build fails due to unused tex_index
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
|
|
to compile/link
|
|
compile/link
|
|
|