Age | Commit message (Collapse) | Author |
|
|
|
in trying to make code signing work
|
|
security wise and leads to an extra copy of dullahan_host.exe because of a code signing bug
|
|
Dullahan repository
|
|
(aduly swim) for now but will evolve
|
|
fall-off settings updates
|
|
SL-13133 Numerical camera preset names sorting order fix
Approved-by: Maxim Nikolenko
|
|
|
|
|
|
|
|
|
|
|
|
text file is UTF-8 with BOM
|
|
|
|
|
|
|
|
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
after trying to upload the model with the texture from the non-English directory
|
|
|
|
|
|
|
|
floater is minimized
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
|
|
llassert is not used in 'release' configuration and build fails due to unused tex_index
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
following promotion of DRTVWR-440
|
|
|
|
|
|
The way legacy_header_height works is just wrong...
|
|
|
|
|