From 95e5b509218641547a7860487af0deb59bf2f1b1 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 10 Oct 2021 00:40:02 -0400
Subject: [PATCH] Strange RLVa bug is strange
---
indra/newview/rlvhelper.h | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 6aa83af1d8b..2bb7bb038fc 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -731,16 +731,9 @@ inline void RlvBehaviourInfo::toggleBehaviourFlag(EBehaviourFlags eBhvrFlag, boo
inline std::string RlvCommand::asString() const
{
// NOTE: @clear=<param> should be represented as clear:<param>
- std::string bhvr = getBehaviour();
- if (m_eParamType != RLV_TYPE_CLEAR && !m_strOption.empty())
- {
- absl::StrAppend(&bhvr, ":", m_strOption);
- }
- else if (!m_strParam.empty())
- {
- absl::StrAppend(&bhvr, ":", m_strParam);
- }
- return bhvr;
+ return (m_eParamType != RLV_TYPE_CLEAR)
+ ? (!m_strOption.empty()) ? (std::string(getBehaviour())).append(":").append(m_strOption) : (std::string(getBehaviour()))
+ : (!m_strParam.empty()) ? (std::string(getBehaviour())).append(":").append(m_strParam) : (std::string(getBehaviour()));
}
inline bool RlvCommand::operator ==(const RlvCommand& rhs) const
--
GitLab