diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-21 16:00:45 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-21 16:00:45 -0700 |
| commit | e9dbee00262a437e4b3f971b37ea636e92032133 (patch) | |
| tree | 57f79641ee532f3f80b0fbd89d3a1f42de398829 /indra/newview/llmachineid.cpp | |
| parent | 78e62fe0f16d95a2afb6c4205b121db189c297b9 (diff) | |
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.
Diffstat (limited to 'indra/newview/llmachineid.cpp')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index b0ee8e7fcb..46411ac13d 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -263,6 +263,7 @@ S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len) if (has_static_unique_id) { memcpy ( unique_id, &static_unique_id, len); +#if LL_LOG_MACHINE_ID LL_INFOS_ONCE("AppInit") << "UniqueID: 0x"; // Code between here and LL_ENDL is not executed unless the LL_DEBUGS // actually produces output @@ -276,6 +277,7 @@ S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len) } // Reset default output formatting to avoid nasty surprises! LL_CONT << std::dec << std::setw(0) << std::setfill(' ') << LL_ENDL; +#endif return 1; } return 0; |