Age | Commit message (Collapse) | Author |
|
|
|
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
|
|
|
|
|
|
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
|
following promotion of DRTVWR-546
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SL-17219
|
|
|
|
|
|
|
|
deferred shaders. Move reflection probe shaders to class3 and restore class2 shaders to non-reflection probe versions.
|
|
|
|
|
|
|
|
|
|
|
|
doing a full resolution render instead of a 512x512 render.
|
|
|
|
Fix ASCII specific function
|
|
SL-17463: Have different default value for MiniMapRotate for new vs existing user
Approved-by: Andrey Lihatskiy
|
|
|
|
rotation by default), but set MiniMapRotate to false for new installs
|
|
|
|
|
|
|
|
dependent_it in llfloater was not valid after dependent floater removed itself from the list
|
|
before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# scripts/content_tools/anim_tool.py
|
|
before sending to simulator.
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
|
|
|
|
animations containing invalid joint names
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
|
|
Update task branch from main project branch.
|
|
|
|
DRTVWR-544-maint
|
|
|
|
|
|
DRTVWR-546
|
|
|