b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
1eeb4c85a1
SL-15258: No 'using namespace std' with Windows SDK
...
With /std:c++17, in wbemcli.h included by <Wbemidl.h>, we were getting errors
concerning an ambiguous symbol 'byte'. This turns out to be due to a 'using
namespace std' declaration before the #include. The linked workaround advises
moving 'using namespace std' after the #include. But since the ONLY symbol
from std that was used without qualification was 'hex' in a few places, remove
'using namespace std' altogether and just write 'std::hex' everywhere.
https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889#T-N138537
2021-05-14 10:36:29 -04:00
6b7ef8c858
SL-14481 Use serial number as unique key on Mac
2020-12-08 18:21:05 +02:00
9432e092d3
SL-2363 Use only product uuid and fallback to product serial
2020-12-05 02:20:26 +02:00
970345e6ea
SL-2363 Windows product key not suitable as unique machine key
2020-12-04 18:52:31 +02:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
e9dbee0026
SL-11238
...
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
3961a9e80a
SL-11061 Viewer crashes on launch if serial is either unset or does not return a string
2019-04-30 15:24:49 +03:00
47bb094b47
SL-10565 LLMachineID crashes
2019-04-30 15:23:06 +03:00
394615c62f
SL-10565 LLMachineID crashes
2019-02-21 19:51:32 +02:00
530f69ff33
MAINT-7541 Not able to save login credentials on clean install
2017-07-10 17:22:12 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
e19809cb91
improve logging of machine id generation
2015-04-02 21:12:43 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
fc8d6384b7
In getUniqueID(), don't forget to reset formatting on log stream.
...
Otherwise later log fields start showing up with zero fill, etc.
2012-07-24 07:55:45 -04:00
28c81e92cc
Fix LLMachineID::getUniqueID() LL_DEBUGS log output.
...
getUniqueID() was logging six somewhat random bytes as garbage characters.
Change to produce a hex string instead.
2012-07-23 17:40:07 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
495f62298c
explicit cast cr:Roxie
2010-05-27 15:36:45 -07:00
250e57cc95
ifdef out windows includes
2010-05-27 14:02:58 -07:00
cca5aa48ae
Add new mechanism for getting a unique machine id.
2010-05-26 23:46:42 -07:00
Andrey Lihatskiy