Age | Commit message (Collapse) | Author |
|
|
|
|
|
Moving a copy of OpenSSL 1.1.1 to D543 from D520 to have less conflicts with zlib-ng integration later
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
# indra/win_crash_logger/llcrashloggerwindows.cpp
Cherry picked from DRTVWR-520
|
|
|
|
|
|
|
|
number for any position axii causes global position to be used
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Potentially a result of a merge conflict, same check and recorder are inside doFlexibleUpdate();
|
|
|
|
different parcels
|
|
|
|
|
|
|
|
|
|
following promotion of DRTVWR-531
|
|
avatar to sit" shown twice.
|
|
Does not cover other opposite-direction movements since only rotation is viewer handled.
|
|
|
|
|
|
screw ups)
|
|
|
|
Server message by id "LoginFailure" was pulling in header instead of a message
|
|
|
|
|
|
following promotion of DRTVWR-516
|
|
This reverts commit efc8b268a2686a86c0975b4b3f67ef821a416d98.
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
|
|
|
|
following promotion of DRTVWR-518
|
|
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
|
|
|
|
|
|
|
|
Also includes a tweak to viewer_manifest.py to handle some CEF file changes"
|
|
|
|
in SL-15370
|
|
|