Age | Commit message (Collapse) | Author |
|
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
|
|
|
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
content
|
|
|
|
|
|
|
|
|
|
|
|
|
|
in LLUUID::operator==(LLUUID const &) and LLFolderView::removeSelectedItems()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(long long round) in VS2013
|
|
inventory received or recent items selected
|
|
inventory received or recent items selected
|
|
variables [-Wunused-const-variable]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
when listing will unlist. Make update skip consistency check when called from internal level (not public API).
|
|
|
|
|
|
|
|
for non-capitalised names.
|
|
|
|
folder view has not been reparented.
|
|
|
|
|
|
created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
|