From 7f5972c8b37d71fdd88136ef1d25788ded668fa6 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 21 Oct 2020 03:02:50 -0400
Subject: [PATCH] Small opts
---
indra/llui/llfloaterreg.h | 2 +-
indra/llui/llkeywords.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
index f4416574caf..04e9ef9dfb3 100644
--- a/indra/llui/llfloaterreg.h
+++ b/indra/llui/llfloaterreg.h
@@ -101,7 +101,7 @@ class LLFloaterReg
}
static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func,
- const std::string& groupname = LLStringUtil::null);
+ const std::string& groupname = std::string());
// Helpers
static LLFloater* getLastFloaterInGroup(std::string_view name);
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 04cb683622b..793354cb1fb 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -164,7 +164,7 @@ std::string LLKeywords::getArguments(LLSD& arguments)
std::string LLKeywords::getAttribute(const std::string& key)
{
attribute_iterator_t it = mAttributes.find(key);
- return (it != mAttributes.end()) ? it->second : "";
+ return (it != mAttributes.end()) ? it->second : std::string();
}
LLColor4 LLKeywords::getColorGroup(const std::string& key_in)
--
GitLab