Age | Commit message (Collapse) | Author |
|
|
|
from below
|
|
|
|
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
|
|
|
|
# Conflicts:
# indra/newview/llinventorygallery.cpp
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llchiclet.h
|
|
|
|
|
|
a preset...' option of the 'Preferences' floater
|
|
# Conflicts:
# indra/newview/llmaterialeditor.cpp
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
|
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Material
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
|
|
|
|
|
|
|
updater. Add probe update debug display.
|
|
|
|
Cleanup. Caused by a merge of main(D567) into D559
|
|
|
|
|
|
|
|
|
|
lights rendered scale with the "Quality & speed" slider
|