Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cut a bit"
This reverts commit 7ac094e92105122b22b4693dafae7f0cee72d9a0.
Commit breaks gallery panel, it is not ready.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# doc/contributions.txt
|
|
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
|
|
|
|
Fix typos in floater_scene_load_stats.xml and llviewerstats.cpp
|
|
Reducing the packet loss...
|
|
# Conflicts:
# indra/newview/llappviewer.cpp
|
|
|
|
|
|
|
|
|
|
enabling AutoFPS
|
|
|
|
handling
|
|
items
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
|
|
|
|
for links
|
|
|
|
|