diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 20:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 20:03:54 +0300 |
| commit | f74c10c4ec6435471bac84473fe865f90843c2df (patch) | |
| tree | b2853d87789dbb84d6c26c259eab6639d3a7e482 /indra/newview/llchannelmanager.cpp | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index f66a9865fc..060430862b 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -161,7 +161,7 @@ void LLChannelManager::onStartUpToastClose() { if(mStartUpChannel) { - mStartUpChannel->setVisible(FALSE); + mStartUpChannel->setVisible(false); mStartUpChannel->closeStartUpToast(); removeChannelByID(STARTUP_CHANNEL_UUID); mStartUpChannel = NULL; @@ -261,8 +261,8 @@ LLNotificationsUI::LLScreenChannel* LLChannelManager::getNotificationScreenChann if (channel == NULL) { - LL_WARNS() << "Can't find screen channel by Notification Channel UUID" << LL_ENDL; - llassert(!"Can't find screen channel by Notification Channel UUID"); + LL_WARNS() << "Can't find screen channel by NotificationChannelUUID" << LL_ENDL; + llassert(!"Can't find screen channel by NotificationChannelUUID"); } return channel; |