Age | Commit message (Collapse) | Author |
|
|
|
|
|
entitlements
|
|
entitlements
|
|
|
|
|
|
+ post merge conflict fix
|
|
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
|
SL-16605: Report VulkanMaxApiVersion with the appropiate Vulkan 0.0, 1.0, 1.x max API version depending on if we can load the .dll and/or vkEnumerateInstanceVersion.
Approved-by: Euclid Linden
|
|
|
|
1.x max API version depending on if we can load the .dll and/or vkEnumerateInstanceVersion.
|
|
|
|
|
|
naming.
|
|
|
|
|
|
|
|
|
|
There shouldn't be any differences for 'None' between normal objects and attachments
|
|
mLastMouseX/Y might need to be assigned from gViewerWindow->getCurrentMouseX();
|
|
SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for fullbrightF.glsl when rigged mesh has alpha mask.
Approved-by: Dave Parks
|
|
fullbrightF.glsl when rigged mesh has alpha mask.
|
|
|
|
DRTVWR-546
|
|
rigged meshes.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SL-16493: Fix non-fullbright partial alpha objects not being lit by sun broken in 511de439a3
Approved-by: Euclid Linden
Approved-by: Dave Parks
|
|
|
|
DRTVWR-546 merge up to 6.5.2
|
|
post deferred state (forward pass rendering for transparency)
|
|
|
|
|
|
|
|
|
|
|
|
DRTVWR-528 merge up to 6.5.2
|
|
|
|
|
|
DRTVWR-546
|
|
|
|
+resolved viewer-manager's inherited conflict
|
|
|
|
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
|
|
broken in 511de439a3
|