From 394b253cfcba86bf1c04eae285953cfa0263fdb8 Mon Sep 17 00:00:00 2001
From: Testicular Slingshot <automatic@null.net>
Date: Wed, 12 Feb 2020 23:28:54 -0400
Subject: [PATCH] Stylistic changes.
---
indra/newview/llimprocessing.cpp | 2 +-
indra/newview/llviewermessage.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index f6093437bb..7150db280d 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -493,7 +493,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
// make sure that we don't have an empty or all-whitespace name
LLStringUtil::trim(name);
static const LLCachedControl<bool> sMarkUnnamedObjects(gSavedSettings, "AlchemyChatMarkUnnamedObjects");
- if (name.empty() && sMarkUnnamedObjects)
+ if (sMarkUnnamedObjects && name.empty())
{
name = LLTrans::getString("Unnamed");
}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8fe20e98cb..6a45f6d2ad 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2412,7 +2412,7 @@ void process_chat_from_simulator(LLMessageSystem* msg, void** user_data)
// make sure that we don't have an empty or all-whitespace name
LLStringUtil::trim(from_name);
static const LLCachedControl<bool> sMarkUnnamedObjects(gSavedSettings, "AlchemyChatMarkUnnamedObjects");
- if (from_name.empty() && sMarkUnnamedObjects)
+ if (sMarkUnnamedObjects && from_name.empty())
{
from_name = LLTrans::getString("Unnamed");
}
--
GitLab