Age | Commit message (Collapse) | Author |
|
# 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
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
following promotion of DRTVWR-440
|
|
|
|
|
|
The way legacy_header_height works is just wrong...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Camera preset, not as separate setting
|
|
|
|
|
|
|
|
water Fresnel
|
|
|
|
|
|
|
|
|
|
|