Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Final merge of DRTVWR-542 into DRTVWR-546, this only picks up a merge fix for updater.
|
|
|
|
|
|
|
|
|
|
DRTVWR-546 merge up to 6.5.3
|
|
|
|
|
|
following promotion of DRTVWR-554
|
|
|
|
|
|
entitlements
|
|
entitlements
|
|
|
|
|
|
+ post merge conflict fix
|
|
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
|
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.
|
|
|
|
|
|
|