diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 21:41:25 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 21:41:25 +0200 |
| commit | f57219efed141b5bc33dd9d08b03a48c6607fa33 (patch) | |
| tree | 5744641957fe7ea94298228e4044d8c552a7dacb /indra/llui/llfocusmgr.cpp | |
| parent | b49400e0882a80dd2972a31cde2152ba979b2ce4 (diff) | |
| parent | 6b866bc6432ef88a79a826c09b17107392bde15f (diff) | |
Merge branch 'release/2026.01' into marchcat/devlinux-2601
# Conflicts:
# indra/llcommon/llprocessor.cpp
# indra/llcorehttp/_refcounted.h
# indra/llcorehttp/_thread.h
# indra/newview/llfeaturemanager.cpp
# indra/newview/llviewershadermgr.cpp
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
| -rw-r--r-- | indra/llui/llfocusmgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 0d7c98294f..7544a44478 100644 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -32,11 +32,11 @@ const F32 FOCUS_FADE_TIME = 0.3f; -LLFocusableElement::LLFocusableElement() -: mFocusLostCallback(NULL), - mFocusReceivedCallback(NULL), - mFocusChangedCallback(NULL), - mTopLostCallback(NULL) +LLFocusableElement::LLFocusableElement() : + mFocusLostCallback(nullptr), + mFocusReceivedCallback(nullptr), + mFocusChangedCallback(nullptr), + mTopLostCallback(nullptr) { } |